python3/ExternalProject_python3.mk | 6 ++----
python3/python-3.3.0-aix.patch.1 | 9 ---------
2 files changed, 2 insertions(+), 13 deletions(-)
New commits:
commit ef3b6fe6411b1f7f0c20361a1a9847e06d4c141f
Author: Michael Stahl <mst...@redhat.com>
Date: Thu Apr 18 22:24:53 2013 +0200
python3: re-enable both debug symbols and optimization
These were apparently accidentally disabled on all non-WNT platforms.
Set the OPT variable from the outside on the platform that needs it.
(regression from ab41efc81ec26fcbd4cdeb9c36fbe8cc274523f)
Change-Id: Ifbf7ec8e0f863cb6368758571496c8b615e3e814
(cherry picked from commit 38232ea1988c8170b60aced89662260e82b86b32)
Reviewed-on: https://gerrit.libreoffice.org/3472
Reviewed-by: Fridrich Strba <fridr...@documentfoundation.org>
Tested-by: Fridrich Strba <fridr...@documentfoundation.org>
diff --git a/python3/ExternalProject_python3.mk
b/python3/ExternalProject_python3.mk
index 2bde4cf..49fa0b4 100644
--- a/python3/ExternalProject_python3.mk
+++ b/python3/ExternalProject_python3.mk
@@ -57,9 +57,6 @@ python3_cflags =
ifeq ($(ENABLE_VALGRIND),TRUE)
python3_cflags += $(VALGRIND_CFLAGS)
endif
-ifeq ($(OS),AIX)
- python3_cflags += -g0
-endif
$(call gb_ExternalProject_get_state_target,python3,build) :
cd $(EXTERNAL_WORKDIR) \
@@ -68,7 +65,8 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
--with-system-expat \
$(if $(filter TRUE,$(ENABLE_VALGRIND)),--with-valgrind) \
--prefix=/python-inst \
- $(if $(filter AIX,$(OS)),--disable-ipv6 --with-threads) \
+ $(if $(filter AIX,$(OS)),--disable-ipv6 --with-threads \
+ OPT="-g0 -fwrapv -O3 -Wall") \
$(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-framework=/@__________________________________________________OOO
--with-framework-name=LibreOfficePython, \
diff --git a/python3/python-3.3.0-aix.patch.1 b/python3/python-3.3.0-aix.patch.1
index 1a24531..33f0426 100644
--- a/python3/python-3.3.0-aix.patch.1
+++ b/python3/python-3.3.0-aix.patch.1
@@ -33,15 +33,6 @@ build with GCC on AIX
INSTSONAME="$LDLIBRARY".$SOVERSION
if test "$with_pydebug" != yes
then
-@@ -6169,7 +6175,7 @@
- # debug builds.
- OPT="-g -O0 -Wall $STRICT_PROTO"
- else
-- OPT="-g $WRAP -O3 -Wall $STRICT_PROTO"
-+ OPT="$WRAP -O0 -Wall $STRICT_PROTO"
- fi
- ;;
- *)
@@ -8301,8 +8307,13 @@
then
case $ac_sys_system/$ac_sys_release in
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
