Xisco Fauli
4c223ffe8a
destdir-darwin.patch.1 is needed now after https://github.com/python/cpython/issues/149351 The patch basically reverts it, otherwise the mac build fails with dyld[52582]: Library not loaded: /@__________________________________________________OOO/LibreOfficePython.framework/Versions/3.13/LibreOfficePython Referenced from: <B217B854-E01D-3BF6-ACE3-EE94548D7A23> /Users/tdf/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/instdir/LibreOfficeDev.app/Contents/Frameworks/LibreOfficePython.framework/Versions/3.13/Resources/Python.app/Contents/MacOS/LibreOfficePython Reason: tried: '/@__________________________________________________OOO/LibreOfficePython.framework/Versions/3.13/LibreOfficePython' (no such file), '/System/Volumes/Preboot/Cryptexes/OS/@__________________________________________________OOO/LibreOfficePython.framework/Versions/3.13/LibreOfficePython' (no such file), '/@__________________________________________________OOO/LibreOfficePython.framework/Versions/3.13/LibreOfficePython' (no such file) /bin/sh: line 1: 52582 Abort trap: 6 DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+$DYLD_LIBRARY_PATH:}$I/LibreOfficeDev.app/Contents/Frameworks:$W/UnpackedTarball/cppunit/src/cppunit/.libs TEST_LIB=$W/LinkTarget/Library/libtest.dylib URE_BOOTSTRAP=vnd.sun.star.pathname:$I/LibreOfficeDev.app/Contents/Resources/fundamentalrc PYTHONPATH="$S/unotest/source/python:$I/LibreOfficeDev.app/Contents/Resources:$I/LibreOfficeDev.app/Contents/Frameworks:$S/pyuno/qa/pytests" UserInstallation=file://$W/PythonTest/pyuno_pytests_testimports/user TestUserDir="file://$W/PythonTest/pyuno_pytests_testimports/" PYTHONDONTWRITEBYTECODE=1 MAX_CONCURRENCY=4 MOZILLA_CERTIFICATE_FOLDER=dbm: SAL_DISABLE_SYNCHRONOUS_PRINTER_DETECTION=1 SAL_USE_VCLPLUGIN=svp LIBO_LANG=C $I/LibreOfficeDev.app/Contents/Frameworks/LibreOfficePython.framework/Versions/3.13/Resources/Python.app/Contents/MacOS/LibreOfficePython -m org.libreoffice.unittest testimports [build CXX] starmath/qa/cppunit/test_parse.cxx dyld[52524]: Library not loaded: /@__________________________________________________OOO/LibreOfficePython.framework/Versions/3.13/LibreOfficePython Referenced from: <B217B854-E01D-3BF6-ACE3-EE94548D7A23> /Users/tdf/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/instdir/LibreOfficeDev.app/Contents/Frameworks/LibreOfficePython.framework/Versions/3.13/Resources/Python.app/Contents/MacOS/LibreOfficePython Reason: tried: '/@__________________________________________________OOO/LibreOfficePython.framework/Versions/3.13/LibreOfficePython' (no such file), '/System/Volumes/Preboot/Cryptexes/OS/@__________________________________________________OOO/LibreOfficePython.framework/Versions/3.13/LibreOfficePython' (no such file), '/@__________________________________________________OOO/LibreOfficePython.framework/Versions/3.13/LibreOfficePython' (no such file) /bin/sh: line 1: 52524 Abort trap: 6 DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+$DYLD_LIBRARY_PATH:}$I/LibreOfficeDev.app/Contents/Frameworks:$W/UnpackedTarball/cppunit/src/cppunit/.libs TEST_LIB=$W/LinkTarget/Library/libtest.dylib URE_BOOTSTRAP=vnd.sun.star.pathname:$I/LibreOfficeDev.app/Contents/Resources/fundamentalrc PYTHONPATH="$S/unotest/source/python:$I/LibreOfficeDev.app/Contents/Resources:$I/LibreOfficeDev.app/Contents/Frameworks:$S/codemaker/tests/pythonmaker" UserInstallation=file://$W/PythonTest/codemaker_python/user TestUserDir="file://$W/PythonTest/codemaker_python/" PYTHONDONTWRITEBYTECODE=1 MAX_CONCURRENCY=4 MOZILLA_CERTIFICATE_FOLDER=dbm: SAL_DISABLE_SYNCHRONOUS_PRINTER_DETECTION=1 SAL_USE_VCLPLUGIN=svp LIBO_LANG=C $I/LibreOfficeDev.app/Contents/Frameworks/LibreOfficePython.framework/Versions/3.13/Resources/Python.app/Contents/MacOS/LibreOfficePython -m org.libreoffice.unittest test_pythonmaker Downloaded from https://www.python.org/ftp/python/3.13.14/Python-3.13.14.tar.xz Change-Id: I8f408fbdb2b37a4957f1e07a83176e6a3b889e96 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/206365 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
12 lines
571 B
Groff
12 lines
571 B
Groff
--- python3/Makefile.pre.in 2026-06-12 15:31:46.305166136 +0200
|
|
+++ python3/Makefile.pre.in 2026-06-12 15:33:10.216862520 +0200
|
|
@@ -955,7 +955,7 @@
|
|
$(INSTALL) -d -m $(DIRMODE) $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)
|
|
$(CC) -o $(LDLIBRARY) $(PY_CORE_LDFLAGS) -dynamiclib \
|
|
-all_load $(LIBRARY) \
|
|
- -install_name $(PYTHONFRAMEWORKINSTALLNAMEPREFIX)/$(PYTHONFRAMEWORK) \
|
|
+ -install_name $(DESTDIR)$(PYTHONFRAMEWORKINSTALLNAMEPREFIX)/$(PYTHONFRAMEWORK) \
|
|
-compatibility_version $(VERSION) \
|
|
-current_version $(VERSION) \
|
|
-framework CoreFoundation $(LIBS);
|