-*- Mode: diff -*- LO needs to build both against MacOSX SDK and not produce universal binaries. diff -ru python3.orig/configure python3/configure --- python3.orig/configure 2015-07-26 17:36:11.808497783 +0200 +++ python3/configure 2015-07-26 17:38:49.016508337 +0200 @@ -6794,7 +6794,20 @@ then case "$UNIVERSAL_ARCHS" in 32-bit) - UNIVERSAL_ARCH_FLAGS="-arch ppc -arch i386" + # LO does not use Universal Binaries (but the only way to set a SDK + # here implies that, so de-universalize here...) + case `/usr/bin/arch` in + i386) + UNIVERSAL_ARCH_FLAGS="-arch i386" + ;; + ppc) + UNIVERSAL_ARCH_FLAGS="" + ;; + *) + as_fn_error $? "Unexpected output of 'arch' on OSX" "$LINENO" 5 + ;; + esac + LIPO_32BIT_FLAGS="" ARCH_RUN_32BIT="" ;; diff -ru python3.orig/Mac/Makefile.in python3/Mac/Makefile.in --- python3.orig/Mac/Makefile.in 2015-07-05 18:50:07.000000000 +0200 +++ python3/Mac/Makefile.in 2015-07-26 17:40:14.860514100 +0200 @@ -43,7 +43,7 @@ INSTALL_SCRIPT= @INSTALL_SCRIPT@ INSTALL_DATA=@INSTALL_DATA@ LN=@LN@ -STRIPFLAG=-s +STRIPFLAG= CPMAC=CpMac APPTEMPLATE=$(srcdir)/Resources/app diff -ru python3.orig/Mac/Resources/app/Info.plist.in python3/Mac/Resources/app/Info.plist.in --- python3.orig/Mac/Resources/app/Info.plist.in 2015-07-05 18:50:07.000000000 +0200 +++ python3/Mac/Resources/app/Info.plist.in 2015-07-26 17:42:00.974521224 +0200 @@ -18,7 +18,7 @@ CFBundleExecutable - Python + LibreOfficePython CFBundleGetInfoString %version%, (c) 2001-2016 Python Software Foundation. CFBundleHelpBookFolder diff -ru python3.orig/Mac/Resources/framework/Info.plist.in python3/Mac/Resources/framework/Info.plist.in --- python3.orig/Mac/Resources/framework/Info.plist.in 2015-07-05 18:50:07.000000000 +0200 +++ python3/Mac/Resources/framework/Info.plist.in 2015-07-26 17:41:15.996518204 +0200 @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion English CFBundleExecutable - Python + @PYTHONFRAMEWORK@ CFBundleGetInfoString Python Runtime and Library CFBundleIdentifier diff -ru python3.orig/setup.py python3/setup.py --- python3.orig/setup.py 2015-07-26 17:36:11.804497783 +0200 +++ python3/setup.py 2015-07-26 17:39:48.599512337 +0200 @@ -468,11 +468,11 @@ # Ensure that /usr/local is always used, but the local build # directories (i.e. '.' and 'Include') must be first. See issue # 10520. - if not cross_compiling: + if not cross_compiling and host_platform != 'darwin': add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') # only change this for cross builds for 3.3, issues on Mageia - if cross_compiling: + if cross_compiling or host_platform == 'darwin': self.add_gcc_paths() self.add_multiarch_paths() tro/collabora/co-24.04.7'>distro/collabora/co-24.04.7 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/unoil
AgeCommit message (Expand)Author
2013-10-30cli_ure: remove CLI version PackagesMichael Stahl
2013-10-28gbuild: set Package default target to INSTDIRMichael Stahl
2013-10-28unoil: build cli_oootypes.dll via CliUnoApiMichael Stahl
2013-10-25gbuild: refactor UnoApi to remove rdb files from OUTDIRMichael Stahl
2013-08-19Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVATor Lillqvist
2013-04-29climaker no longer needs *.rdb.oldformat input filesStephan Bergmann
2013-04-24More "Let climaker work on *.rdb.oldformat for now"Stephan Bergmann
2013-04-22Move to MPLv2 license headers, with ESC decision and author's permission.Michael Meeks
2013-04-11[API CHANGE] WIP: Experimental new binary type.rdb formatStephan Bergmann
2013-03-14remove legacy build.pl prj/build.lst files.Michael Meeks
2013-02-28remove all d.lstMichael Stahl
2013-01-26gbuild: fix silly "expandtabs" in makefile VIM modelinesMichael Stahl
2012-12-30add runtime deps for custom targetsDavid Tardon
2012-08-15gbuild: remove horrible abuses of gb_Jar_use_jars:Michael Stahl
2012-06-26re-base on ALv2 code.Michael Meeks
2012-05-10normalize variable names in gbuild user makefilesMichael Stahl
2012-05-09gbuild: remove gb_Helper_abbreviate_dirs_nativeMatúš Kukan
2012-04-29make gbuild the default assumption of build.plBjoern Michaelsen
2012-04-14unoil: remove generated classes before calling javamakerMichael Stahl
2012-04-09enforce only one possible use of gb_CustomTargetMatúš Kukan
2012-04-08gbuild: "use" vs. "add":Michael Stahl
2012-04-06include variable before it's usedMatúš Kukan
2012-04-06unoil: use CustomTarget makefilesMatúš Kukan
2012-03-23.txt files don't need executable bitsMichael Stahl
2012-03-16unoil: add missing dependencies in custom makefileMichael Stahl