[libreoffice] Resolves: rhbz#742780 let make OPT_FLAGS=... override SDK flags

Wed Feb 20 16:57:58 UTC 2013

commit b268abc4808979c875d5cbbdb08ccea861416e90
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Feb 20 17:57:51 2013 +0100

    Resolves: rhbz#742780 let make OPT_FLAGS=... override SDK flags

 ...-Let-make-OPT_FLAGS-.-override-SDK-optimi.patch |  124 ++++++++++++++++++++
 libreoffice.spec                                   |    3 +
 2 files changed, 127 insertions(+), 0 deletions(-)
---

diff --git a/0001-rhbz-742780-Let-make-OPT_FLAGS-.-override-SDK-optimi.patch b/0001-rhbz-742780-Let-make-OPT_FLAGS-.-override-SDK-optimi.patch
new file mode 100644
index 0000000..1434057
--- /dev/null
+++ b/0001-rhbz-742780-Let-make-OPT_FLAGS-.-override-SDK-optimi.patch
@@ -0,0 +1,124 @@
+From a14eedf997daf30379ceabc1933273360d4d3188 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman at redhat.com>
+Date: Wed, 20 Feb 2013 17:49:20 +0100
+Subject: [PATCH] rhbz#742780: Let make OPT_FLAGS=... override SDK
+ optimization/debugging flags
+
+Change-Id: I639fa16f74342b108a395d7d0335d116f96677f1
+---
+ odk/settings/settings.mk | 52 ++++++++++++++++++++----------------------------
+ 1 file changed, 22 insertions(+), 30 deletions(-)
+
+diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
+index a71be27..eecde50 100644
+--- a/odk/settings/settings.mk
++++ b/odk/settings/settings.mk
+@@ -95,17 +95,16 @@ EMPTYSTRING=
+ PATH_SEPARATOR=;
+ 
+ # use this for release version
+-CC_FLAGS_JNI=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa
+-CC_FLAGS=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa
++ifeq "$(DEBUG)" "yes"
++OPT_FLAGS=-Zi
++endif
++CC_FLAGS_JNI=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa $(OPT_FLAGS)
++CC_FLAGS=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa $(OPT_FLAGS)
+ ifeq "$(CPP_MANIFEST)" "true"
+ LINK_MANIFEST=mt -manifest $@.manifest "-outputresource:$@;2"
+ else
+ LINK_MANIFEST=
+ endif
+-ifeq "$(DEBUG)" "yes"
+-CC_FLAGS_JNI+=-Zi
+-CC_FLAGS+=-Zi
+-endif
+ 
+ CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
+ SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/include/win32"
+@@ -213,14 +212,13 @@ STORELIB=-lstore
+ EMPTYSTRING=
+ PATH_SEPARATOR=:
+ 
+-#CC_FLAGS_JNI=-c -KPIC
+-#CC_FLAGS=-c -KPIC -xldscope=hidden
+-CC_FLAGS_JNI=-c -fpic
+-CC_FLAGS=-c -fpic -fvisibility=hidden
+ ifeq "$(DEBUG)" "yes"
+-CC_FLAGS_JNI+=-g
+-CC_FLAGS+=-g
++OPT_FLAGS=-g
+ endif
++#CC_FLAGS_JNI=-c -KPIC $(OPT_FLAGS)
++#CC_FLAGS=-c -KPIC -xldscope=hidden $(OPT_FLAGS)
++CC_FLAGS_JNI=-c -fpic $(OPT_FLAGS)
++CC_FLAGS=-c -fpic -fvisibility=hidden $(OPT_FLAGS)
+ CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
+ SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/include/solaris"
+ 
+@@ -341,16 +339,14 @@ STORELIB=-lstore
+ EMPTYSTRING=
+ PATH_SEPARATOR=:
+ 
+-CC_FLAGS_JNI=-c -fpic
+-CC_FLAGS=-c -fpic -fvisibility=hidden
+ # -O is necessary for inlining (see gcc documentation)
+ ifeq "$(DEBUG)" "yes"
+-CC_FLAGS_JNI+=-g
+-CC_FLAGS+=-g
++OPT_FLAGS=-g
+ else
+-CC_FLAGS_JNI+=-O
+-CC_FLAGS+=-O
++OPT_FLAGS=-O
+ endif
++CC_FLAGS_JNI=-c -fpic $(OPT_FLAGS)
++CC_FLAGS=-c -fpic -fvisibility=hidden $(OPT_FLAGS)
+ 
+ ifeq "$(PROCTYPE)" "ppc"
+ CC_FLAGS+=-fPIC
+@@ -466,16 +462,14 @@ INSTALL_NAME_URELIBS_BIN=$(XCRUN) install_name_tool -change @___________________
+ EMPTYSTRING=
+ PATH_SEPARATOR=:
+ 
+-CC_FLAGS_JNI=-malign-natural -c -fPIC -fno-common $(GCC_ARCH_OPTION)
+-CC_FLAGS=-malign-natural -c -fPIC -fno-common $(GCC_ARCH_OPTION) -fvisibility=hidden
+ # -O is necessary for inlining (see gcc documentation)
+ ifeq "$(DEBUG)" "yes"
+-CC_FLAGS_JNI+=-g
+-CC_FLAGS+=-g
++OPT_FLAGS=-g
+ else
+-CC_FLAGS_JNI+=-O
+-CC_FLAGS+=-O
++OPT_FLAGS=-O
+ endif
++CC_FLAGS_JNI=-malign-natural -c -fPIC -fno-common $(GCC_ARCH_OPTION) $(OPT_FLAGS)
++CC_FLAGS=-malign-natural -c -fPIC -fno-common $(GCC_ARCH_OPTION) -fvisibility=hidden $(OPT_FLAGS)
+ 
+ SDK_JAVA_INCLUDES = -I/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers -I/System/Library/Frameworks/JavaVM.framework/Headers
+ CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
+@@ -580,16 +574,14 @@ STORELIB=-lstore
+ EMPTYSTRING=
+ PATH_SEPARATOR=:
+ 
+-CC_FLAGS_JNI=-c -g -fPIC -DPIC $(PTHREAD_CFLAGS)
+-CC_FLAGS=-c -g -fPIC -DPIC $(PTHREAD_CFLAGS) -fvisibility=hidden
+ # -O is necessary for inlining (see gcc documentation)
+ ifeq "$(DEBUG)" "yes"
+-CC_FLAGS_JNI+=-g
+-CC_FLAGS+=-g
++OPT_FLAGS=-g
+ else
+-CC_FLAGS_JNI+=-O
+-CC_FLAGS+=-O
++OPT_FLAGS=-O
+ endif
++CC_FLAGS_JNI=-c -g -fPIC -DPIC $(PTHREAD_CFLAGS) $(OPT_FLAGS)
++CC_FLAGS=-c -g -fPIC -DPIC $(PTHREAD_CFLAGS) -fvisibility=hidden $(OPT_FLAGS)
+ 
+ SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/include/freebsd"
+ CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
+-- 
+1.8.1.2
+
diff --git a/libreoffice.spec b/libreoffice.spec
index c824187..00303d5 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -264,6 +264,7 @@ Patch24: 0001-fix-compile-for-change-to-boost-1.53.0-declaring-sma.patch
 Patch25: 0001-fdo-60491-scp2-always-package-emboleobj-library-on-n.patch
 Patch26: 0001-Resolves-rhbz-895196-sc-filter-float-a11y-parent-of-.patch
 Patch27: 0001-do-not-access-vector-elements-beyond-size-rhbz-84751.patch
+Patch28: 0001-rhbz-742780-Let-make-OPT_FLAGS-.-override-SDK-optimi.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -1014,6 +1015,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch25 -p1 -b .fdo-60491-scp2-always-package-emboleobj-library-on-n.patch
 %patch26 -p1 -b .rhbz-895196-sc-filter-float-a11y-parent-of-.patch
 %patch27 -p1 -b .do-not-access-vector-elements-beyond-size-rhbz-84751.patch
+%patch28 -p1 -b .rhbz-742780-Let-make-OPT_FLAGS-.-override-SDK-optimi.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2083,6 +2085,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %changelog
 * Wed Feb 20 2013 Eike Rathke <erack at redhat.com> - 1:4.0.0.3-8-UNBUILT
 - do not access vector elements beyond size, rhbz#847519 related
+- Resolves: rhbz#742780 let make OPT_FLAGS=... override SDK flags
 
 * Tue Feb 19 2013 Caolán McNamara <caolanm at redhat.com> - 1:4.0.0.3-7
 - Resolves: rhbz#895196 sc filter float a11y parent of itself
