diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-13 22:01:26 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-13 22:34:42 +0200 |
| commit | df52c9f477ba2801ed3535762cfa6e89ce9d6812 (patch) | |
| tree | 2ae00d37d99cef124b9bec81070455c13446344a /python3 | |
| parent | 1ecd1985b1415ed95c472a45c010f8d1a9a99837 (diff) | |
python3: fix the MacOSX build here too
/usr/bin/install -s will invoke "xcrun strip", and there are a few
hardocded install_name_tool left.
Change-Id: I839af379320b4886c45a12c9a1d4fa88d2ef0059
Diffstat (limited to 'python3')
| -rw-r--r-- | python3/ExternalProject_python3.mk | 4 | ||||
| -rw-r--r-- | python3/python-3.3.0-darwin.patch.1 | 11 |
2 files changed, 13 insertions, 2 deletions
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 |