python3/ExternalProject_python3.mk | 6 ++++--
scp2/source/python/profileitem_python.scp | 26 +++++++++++++-------------
2 files changed, 17 insertions(+), 15 deletions(-)
New commits:
commit e75e0214134ca6ad92150bf6099c12d8859575b1
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Aug 28 10:05:14 2013 +0200
Fix PYUNO_LOADER_PYTHONPATH for non-ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
Change-Id: Ifc164b80466d3b847ce1214c28a1ba79fdfd690b
diff --git a/scp2/source/python/profileitem_python.scp
b/scp2/source/python/profileitem_python.scp
index e66eb1a..64158fe 100644
--- a/scp2/source/python/profileitem_python.scp
+++ b/scp2/source/python/profileitem_python.scp
@@ -41,7 +41,7 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonhome
#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
Value = "$ORIGIN/../Frameworks/LibreOfficePython.framework";
#elif defined MACOSX
- Value = CONCAT2($ORIGIN,/LibreOfficePython.framework);
+ Value = "$ORIGIN/LibreOfficePython.framework";
#else
Value = CONCAT2($ORIGIN/python-core-,PYVERSION);
#endif
@@ -54,37 +54,37 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonpath
Section = "Bootstrap";
Order = 1;
Key = "PYUNO_LOADER_PYTHONPATH";
-#ifdef SYSTEM_PYTHON
+ #if defined SYSTEM_PYTHON
Value = "$ORIGIN";
-#else
- #ifdef UNX
- #ifdef MACOSX
- #define FRAMEWORKLIB
CONCAT3($ORIGIN,/../Frameworks/LibreOfficePython.framework/Versions/Current/lib/python,PYMAJMIN)
+ #elif defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+ #define FRAMEWORKLIB
CONCAT2($ORIGIN/../Frameworks/LibreOfficePython.framework/Versions/Current/lib/python,PYMAJMIN)
Value = CONCAT4(FRAMEWORKLIB FRAMEWORKLIB,
/lib-dynload FRAMEWORKLIB,
/lib-tk FRAMEWORKLIB,
/site-packages $ORIGIN);
- #else
+ #elif defined MACOSX
+ #define FRAMEWORKLIB
CONCAT2($ORIGIN/LibreOfficePython.framework/Versions/Current/lib/python,PYMAJMIN)
+ Value = CONCAT4(FRAMEWORKLIB FRAMEWORKLIB,
+ /lib-dynload FRAMEWORKLIB,
+ /lib-tk FRAMEWORKLIB,
+ /site-packages $ORIGIN);
+ #elif defined UNX
Value = CONCAT9($ORIGIN/python-core-,PYVERSION,
/lib $ORIGIN/python-core-,PYVERSION,
/lib/lib-dynload $ORIGIN/python-core-,PYVERSION,
/lib/lib-tk $ORIGIN/python-core-,PYVERSION,
/lib/site-packages $ORIGIN);
- #endif
- #else
- #ifdef _gcc3
+ #elif defined _gcc3
Value = STRING(CONCAT9($ORIGIN/python-core-,PYVERSION,
/lib $ORIGIN/python-core-,PYVERSION,
/lib/lib-dynload $ORIGIN/python-core-,PYVERSION,
/lib/lib-tk $ORIGIN/python-core-,PYVERSION,
/lib/site-packages $ORIGIN));
- #else
+ #else
Value = STRING(CONCAT5($ORIGIN/python-core-,PYVERSION,
/lib $ORIGIN/python-core-,PYVERSION,
/lib/site-packages $ORIGIN));
- #endif
#endif
-#endif
End
// DISABLE_PYUNO
commit dccf47b7f61e088622747539d1487590080da3b8
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Aug 28 10:04:08 2013 +0200
Build python3 with debug flags if --enable-debug
...the special case for AIX can probably be cleaned up?
Change-Id: I34ca29acaddcff9b811067504c12a8243a6d046b
diff --git a/python3/ExternalProject_python3.mk
b/python3/ExternalProject_python3.mk
index 805e739..22065bb 100644
--- a/python3/ExternalProject_python3.mk
+++ b/python3/ExternalProject_python3.mk
@@ -63,8 +63,10 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
$(if $(filter TRUE,$(ENABLE_VALGRIND)),--with-valgrind) \
--prefix=/python-inst \
$(if $(filter MACOSX,$(OS)),,--with-system-expat) \
- $(if $(filter AIX,$(OS)),--disable-ipv6 --with-threads \
- OPT="-g0 -fwrapv -O3 -Wall") \
+ $(if $(filter AIX,$(OS)), \
+ --disable-ipv6 --with-threads OPT="-g0 -fwrapv -O3
-Wall", \
+ $(if $(gb_Module_CURRENTMODULE_DEBUG_ENABLED), \
+ OPT="$(gb_COMPILERNOOPTFLAGS)
$(gb_DEBUG_CFLAGS)")) \
$(if $(filter WNT-GCC,$(OS)-$(COM)),--with-threads
ac_cv_printf_zd_format=no) \
$(if $(filter MACOSX,$(OS)), \
$(if $(filter INTEL
POWERPC,$(CPUNAME)),--enable-universalsdk=$(MACOSX_SDK_PATH)
--with-universal-archs=32-bit)
--enable-framework=/@__________________________________________________OOO
--with-framework-name=LibreOfficePython, \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
