diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | python3/ExternalProject_python3.mk | 4 | ||||
| -rw-r--r-- | python3/python-3.3.0-darwin.patch.1 | 11 |
3 files changed, 15 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index a12823ac97f7..c145970e4e82 100644 --- a/configure.ac +++ b/configure.ac @@ -2722,6 +2722,7 @@ if test $_os = Darwin; then INSTALL_NAME_TOOL=`xcrun -find install_name_tool` AR=`xcrun -find ar` NM=`xcrun -find nm` + STRIP=`xcrun -find strip` LIBTOOL=`xcrun -find libtool` RANLIB=`xcrun -find ranlib` ;; @@ -2885,6 +2886,7 @@ if test $_os = iOS; then INSTALL_NAME_TOOL=`xcrun -find install_name_tool` AR=`xcrun -find ar` NM=`xcrun -find nm` + STRIP=`xcrun -find strip` LIBTOOL=`xcrun -find libtool` RANLIB=`xcrun -find ranlib` fi diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk index 22065bb7aa33..e79a28e0fdc3 100644 --- a/python3/ExternalProject_python3.mk +++ b/python3/ExternalProject_python3.mk @@ -120,7 +120,7 @@ cd \"$$origpath\"\n\ touch $@ $(call gb_ExternalProject_get_state_target,python3,fixinstallnames) : $(call gb_ExternalProject_get_state_target,python3,build) - install_name_tool -change \ + $(INSTALL_NAME_TOOL) -change \ $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/LibreOfficePython \ @executable_path/../../../../LibreOfficePython \ $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/Resources/Python.app/Contents/MacOS/LibreOfficePython @@ -132,7 +132,7 @@ $(call gb_ExternalProject_get_state_target,python3,executables) : $(call gb_Exte for file in python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR) \ python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m \ pythonw$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR) ; do \ - install_name_tool -change \ + $(INSTALL_NAME_TOOL) -change \ $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/LibreOfficePython \ @executable_path/../LibreOfficePython $$file ; done touch $@ diff --git a/python3/python-3.3.0-darwin.patch.1 b/python3/python-3.3.0-darwin.patch.1 index 7c43d8b419db..94e48fe3f25c 100644 --- a/python3/python-3.3.0-darwin.patch.1 +++ b/python3/python-3.3.0-darwin.patch.1 @@ -24,3 +24,14 @@ diff -ru python3.old_/configure python3/configure ARCH_RUN_32BIT="" LIPO_32BIT_FLAGS="" elif test "$UNIVERSAL_ARCHS" = "64-bit" ; then +--- python3/Mac/Makefile.in.orig 2013-09-13 20:16:50.558137603 +0200 ++++ python3/Mac/Makefile.in 2013-09-13 21:57:14.790962423 +0200 +@@ -39,7 +39,7 @@ + INSTALL_SCRIPT= @INSTALL_SCRIPT@ + INSTALL_DATA=@INSTALL_DATA@ + LN=@LN@ +-STRIPFLAG=-s ++STRIPFLAG= + CPMAC=CpMac + + APPTEMPLATE=$(srcdir)/Resources/app |