diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-04-18 22:24:53 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-04-19 00:30:12 +0200 |
| commit | 38232ea1988c8170b60aced89662260e82b86b32 (patch) | |
| tree | 0b2d564f5da18e233f67f82da0e0b340f7bec232 /python3 | |
| parent | 0f7754dfa040804d84feb9cb222ba04752509f26 (diff) | |
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
Diffstat (limited to 'python3')
| -rw-r--r-- | python3/ExternalProject_python3.mk | 6 | ||||
| -rw-r--r-- | python3/python-3.3.0-aix.patch.1 | 9 |
2 files changed, 2 insertions, 13 deletions
diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk index 1731c07f21ca..f030afd71f07 100644 --- a/python3/ExternalProject_python3.mk +++ b/python3/ExternalProject_python3.mk @@ -67,9 +67,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) : $(call gb_ExternalProject_run,build,\ @@ -78,7 +75,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)), \ $(if $(filter INTEL POWERPC,$(CPUNAME)),--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 e287a3f155d4..f8dceb2a4c1f 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 |