git: dab5a380703f - main - www/onlyoffice-documentserver: Fix build conflict with devel/py-build
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 28 Mar 2023 16:25:09 UTC
The branch main has been updated by mikael:
URL: https://cgit.FreeBSD.org/ports/commit/?id=dab5a380703f6468d73de046d7204055d9180436
commit dab5a380703f6468d73de046d7204055d9180436
Author: Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2023-03-27 16:22:07 +0000
Commit: Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2023-03-28 16:24:56 +0000
www/onlyoffice-documentserver: Fix build conflict with devel/py-build
The script "build_tools/make.py" tries to import "scripts/build.py"
but does this not properly and instead imports the module "build"
from devel/py-build
PR: 267265
Submitted by: freebsd.org@vollkorn.cryptobitch.de
---
.../files/patch-build__tools_make.py | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/www/onlyoffice-documentserver/files/patch-build__tools_make.py b/www/onlyoffice-documentserver/files/patch-build__tools_make.py
new file mode 100644
index 000000000000..e09eac182720
--- /dev/null
+++ b/www/onlyoffice-documentserver/files/patch-build__tools_make.py
@@ -0,0 +1,11 @@
+--- build_tools/make.py.orig 2023-03-27 10:50:23 UTC
++++ build_tools/make.py
+@@ -8,7 +8,7 @@ import base
+ sys.path.append('scripts/core_common/modules')
+ import config
+ import base
+-import build
++from scripts import build
+ import build_js
+ import build_server
+ import deploy