[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0-2-42-g4ff409a
The following commit has been merged in the debian-experimental-3.5 branch:
commit 0d41b01852bf1970eba321b51e7e034cb827e2dd
Author: Rene Engelhard <rene@debian.org>
Date: Fri Mar 2 22:58:37 2012 +0100
debian-hardened-buildflags.diff: don't call dpkg-buildflags every time but do it in configure (like for debian-opt.diff)
diff --git a/patches/debian-hardened-buildflags.diff b/patches/debian-hardened-buildflags.diff
index 869af4f..319638e 100644
--- a/patches/debian-hardened-buildflags.diff
+++ b/patches/debian-hardened-buildflags.diff
@@ -1,3 +1,36 @@
+--- a/configure.in-old 2012-03-02 21:48:47.000000000 +0000
++++ b/configure.in 2012-03-02 21:51:29.000000000 +0000
+@@ -9671,6 +9671,17 @@
+ fi
+ AC_SUBST(CDEFAULTOPT)
+
++if [ -x /usr/bin/dpkg-buildflags ]; then
++ HARDEN_CFLAGS=`dpkg-buildflags --get CFLAGS 2>/dev/null | sed -e s/-g// | sed -e s/-O[0-3]//g`
++ HARDEN_CXXFLAGS=`dpkg-buildflags --get CXXFLAGS 2>/dev/null | sed -e s/-g// | sed -e s/-O[0-3]//g`
++ HARDEN_CFLAGS=`dpkg-buildflags --get CPPFLAGS 2>/dev/null`
++ HARDEN_LDFLAGS=`dpkg-buildflags --get LDFLAGS 2>/dev/null`
++fi
++AC_SUBST(HARDEN_CFLAGS)
++AC_SUBST(HARDEN_CXXFLAGS)
++AC_SUBST(HARDEN_CPPFLAGS)
++AC_SUBST(HARDEN_LDFLAGS)
++
+ dnl ===================================================================
+ dnl Setting up the environment.
+ dnl ===================================================================
+--- a/set_soenv.in-old 2012-03-02 21:52:06.000000000 +0000
++++ b/set_soenv.in 2012-03-02 21:53:27.000000000 +0000
+@@ -1569,6 +1569,10 @@
+ ToFile( "CPU", $CPU, "e" );
+ ToFile( "CPUNAME", $CPUNAME, "e" );
+ ToFile( "CDEFAULTOPT", "@CDEFAULTOPT@", "e" );
++ToFile( "HARDEN_CFLAGS", "@HARDEN_CFLAGS@", "e" );
++ToFile( "HARDEN_CXXFLAGS", "@HARDEN_CXXFLAGS@","e" );
++ToFile( "HARDEN_CPPFLAGS", "@HARDEN_CPPFLAGS@","e" );
++ToFile( "HARDEN_LDFLAGS", "@HARDEN_LDFLAGS@", "e" );
+ ToFile( "GUI", $GUI, "e" );
+ ToFile( "GUIBASE", $GUIBASE, "e" );
+ ToFile( "GVER", $GVER, "e" );
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index c094bb4..a0608f4 100644
--- a/solenv/gbuild/LinkTarget.mk
@@ -6,7 +39,7 @@ index c094bb4..a0608f4 100644
OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
endif
-+LDFLAGS += "$(shell dpkg-buildflags --get LDFLAGS)"
++LDFLAGS += "$(HARDEN_LDFLAGS)"
+
# if enabled we link all of these libraries into one larger, merged library
# for which we can do a lot more optimisation, and which is faster to read
@@ -19,8 +52,8 @@ index e85ed83..1665642 100644
endif
endif
-+gb__ENV_CXXFLAGS += $(shell dpkg-buildflags --get CXXFLAGS | sed -e s/-g// | sed -e s/-O[0-3]//g)
-+gb__ENV_CFLAGS += $(shell dpkg-buildflags --get CFLAGS | sed -e s/-g// | sed -e s/-O[0-3]//g)
++gb_LinkTarget_CXXFLAGS += $(HARDEN_CXXFLAGS)
++gb_LinkTarget_CFLAGS += $(HARDEN_CFLAGS)
+
include $(GBUILDDIR)/Helper.mk
include $(GBUILDDIR)/TargetLocations.mk
@@ -29,7 +62,7 @@ index e85ed83..1665642 100644
gb_GLOBALDEFS += -DHAVE_THREADSAFE_STATICS
endif
-+gb_GLOBALDEFS += $(shell dpkg-buildflags --get CPPFLAGS)
++gb_GLOBALDEFS += $(HARDEN_CPPFLAGS)
+
gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
@@ -42,9 +75,9 @@ index a3231a6..b97f354 100644
LINKFLAGS += -Wl,-zdynsort
.ENDIF
-+LINKFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
-+CDEFS += $(shell dpkg-buildflags --get CPPFLAGS)
-+CFLAGS += $(shell dpkg-buildflags --get CFLAGS | sed -e s/-g// | sed -e s/-O[0-3]//g)
++LINKFLAGS += $(HARDEN_LDFLAGS)
++CDEFS += $(HARDEN_CPPFLAGS)
++CFLAGS += $(HARDEN_CFLAGS)
+
# libraries for linking applications
STDLIBGUIMT+=-Wl,--as-needed $(DL_LIB) $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
--
LibreOffice packaging repository
Reply to: