mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

python3: fix the MacOSX build here too

Browse Source 
/usr/bin/install -s will invoke "xcrun strip", and there are a few
hardocded install_name_tool left.

Change-Id: I839af379320b4886c45a12c9a1d4fa88d2ef0059
This commit is contained in:
Michael Stahl
2013-09-13 22:01:26 +02:00
parent 1ecd1985b1
commit df52c9f477
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -2722,6 +2722,7 @@ if test $_os = Darwin; then
INSTALL_NAME_TOOL=`xcrun -find install_name_tool` INSTALL_NAME_TOOL=`xcrun -find install_name_tool`
AR=`xcrun -find ar` AR=`xcrun -find ar`
NM=`xcrun -find nm` NM=`xcrun -find nm`
STRIP=`xcrun -find strip`
LIBTOOL=`xcrun -find libtool` LIBTOOL=`xcrun -find libtool`
RANLIB=`xcrun -find ranlib` RANLIB=`xcrun -find ranlib`
;; ;;
@@ -2885,6 +2886,7 @@ if test $_os = iOS; then
INSTALL_NAME_TOOL=`xcrun -find install_name_tool` INSTALL_NAME_TOOL=`xcrun -find install_name_tool`
AR=`xcrun -find ar` AR=`xcrun -find ar`
NM=`xcrun -find nm` NM=`xcrun -find nm`
STRIP=`xcrun -find strip`
LIBTOOL=`xcrun -find libtool` LIBTOOL=`xcrun -find libtool`
RANLIB=`xcrun -find ranlib` RANLIB=`xcrun -find ranlib`
fi fi

4
python3/ExternalProject_python3.mk
View File

@@ -120,7 +120,7 @@ cd \"$$origpath\"\n\
touch $@ touch $@
$(call gb_ExternalProject_get_state_target,python3,fixinstallnames) : $(call gb_ExternalProject_get_state_target,python3,build) $(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 \ $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/LibreOfficePython \
@executable_path/../../../../LibreOfficePython \ @executable_path/../../../../LibreOfficePython \
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/Resources/Python.app/Contents/MacOS/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) \ for file in python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR) \
python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m \ python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m \
pythonw$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR) ; do \ 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 \ $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/LibreOfficePython \
@executable_path/../LibreOfficePython $$file ; done @executable_path/../LibreOfficePython $$file ; done
touch $@ touch $@

11
python3/python-3.3.0-darwin.patch.1
View File

@@ -24,3 +24,14 @@ diff -ru python3.old_/configure python3/configure
ARCH_RUN_32BIT="" ARCH_RUN_32BIT=""
LIPO_32BIT_FLAGS="" LIPO_32BIT_FLAGS=""
elif test "$UNIVERSAL_ARCHS" = "64-bit" ; then 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