python3/ExternalProject_python3.mk | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit d3e0fe82132f81cbcce9703921884338a78f3071
Author: Tor Lillqvist <t...@iki.fi>
Date: Sat Nov 17 14:34:52 2012 +0200
Make building python3 with current MacOSX tools proceed a bit further
I used the latest Xcode and the 10.7 SDK. Configures, and compiles
(for a while? all that is expected?), but then fails with cp:
.../workdir/unxmacxi.pro/UnpackedTarball/python3/python is a directory
(not copied). That is from ExternalPackage_python3.mk.
No idea how well, if at all, it configures and builds using the Xcode
2 or 3 compiler and 10.4 or 10.5 SDK.
Change-Id: I3ae838263a4db1b67e7c835e567540fac60b98bf
diff --git a/python3/ExternalProject_python3.mk
b/python3/ExternalProject_python3.mk
index 5ffa1a9..dc8e0ff 100644
--- a/python3/ExternalProject_python3.mk
+++ b/python3/ExternalProject_python3.mk
@@ -57,13 +57,15 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
cd $(EXTERNAL_WORKDIR) \
&& ./configure \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
- --enable-shared \
- --with-system-expat \
+ $(if $(filter YES,$(SYSTEM_EXPAT)),--with-system-expat) \
$(if $(strip $(VALGRIND_CFLAGS)),--with-valgrind) \
--prefix=/$(if $(filter
MACOSX,$(OS)),@__________________________________________________OOO,python-inst)
\
$(if $(filter AIX,$(OS)),--disable-ipv6 --with-threads
CFLAGS="-g0") \
$(if $(filter WNT-GCC,$(OS)-$(COM)),--with-threads
ac_cv_printf_zd_format=no) \
- $(if $(filter
MACOSX,$(OS)),--enable-universalsdk=$(MACOSX_SDK_PATH)
--with-universal-archs=32-bit
--enable-frameworks=/SomeDirThatIsNotLibraryOrSystemOrFrameworks
--with-framework-name=OOoPython) \
+ $(if $(filter MACOSX,$(OS)), \
+ --enable-universalsdk=$(MACOSX_SDK_PATH)
--with-universal-archs=32-bit
--enable-framework=/SomeDirThatIsNotLibraryOrSystemOrFrameworks
--with-framework-name=LibreOfficePython, \
+ --enable-shared \
+ ) \
CC="$(strip $(CC) \
$(if $(filter YES,$(SYSTEM_OPENSSL)),,
-I$(OUTDIR)/inc/external) \
$(if $(filter YES,$(SYSTEM_EXPAT)),,
-I$(OUTDIR)/inc/external/expat) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
