[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.0-1-19-g903ae6c
The following commit has been merged in the debian-experimental-4.0 branch:
commit 4f30c5f37880eda98670848763d118fd052bf574
Author: Rene Engelhard <rene@debian.org>
Date: Thu Feb 14 20:35:44 2013 +0100
cleanup hardening; use /usr/share/dpkg/buildflags.mk for C(XX)FLAGS, LDFLAGS
diff --git a/changelog b/changelog
index a37553c..3628453 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,11 @@ libreoffice (1:4.0.0-2) UNRELEASED; urgency=low
* debian/patches/odk-link-to-jdk-1.5-docs.diff: link to
http://java.sun.com/j2se/1.5/docs/api instead of /1.4.1/ as the former
doesn't exist anymore
+ * debian/patches/debian-hardened-buildflags.diff: only set CPPFLAGS here now
+
+ * debian/rules:
+ - use /usr/share/dpkg/buildflags.mk for C(XX)FLAGS, LDFLAGS now that LO honours
+ those from the env in configure. Remove manual passing to make.
-- Rene Engelhard <rene@debian.org> Fri, 08 Feb 2013 22:14:15 +0100
diff --git a/patches/debian-hardened-buildflags.diff b/patches/debian-hardened-buildflags.diff
index 27e67fe..c5a3819 100644
--- a/patches/debian-hardened-buildflags.diff
+++ b/patches/debian-hardened-buildflags.diff
@@ -1,63 +1,31 @@
--- a/configure.ac-old 2012-03-02 21:48:47.000000000 +0000
+++ b/configure.ac 2012-03-02 21:51:29.000000000 +0000
-@@ -9681,6 +9687,17 @@ AC_SUBST(GSTREAMER_0_10_CFLAGS)
+@@ -9681,6 +9687,11 @@ AC_SUBST(GSTREAMER_0_10_CFLAGS)
AC_SUBST(GSTREAMER_0_10_LIBS)
AC_SUBST(ENABLE_GSTREAMER_0_10)
+if test -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_CPPFLAGS=`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 Check whether the OpenGL libraries are available
dnl ===================================================================
--- a/config_host.mk.in-old 2012-04-06 14:17:55.164239390 +0200
+++ b/config_host.mk.in 2012-04-06 14:18:55.440239065 +0200
-@@ -56,6 +56,10 @@
+@@ -56,6 +56,7 @@
export CPU=@CPU@
export CPUNAME=@CPUNAME@
export CDEFAULTOPT=@CDEFAULTOPT@
-+export HARDEN_CFLAGS=@HARDEN_CFLAGS@
-+export HARDEN_CXXFLAGS=@HARDEN_CXXFLAGS@
+export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@
-+export HARDEN_LDFLAGS=@HARDEN_LDFLAGS@
export CPUNAME_FOR_BUILD=@CPUNAME_FOR_BUILD@
export CPU_FOR_BUILD=@CPU_FOR_BUILD@
export CROSS_COMPILING=@CROSS_COMPILING@
-diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
-index c094bb4..a0608f4 100644
---- a/solenv/gbuild/LinkTarget.mk
-+++ b/solenv/gbuild/LinkTarget.mk
-@@ -61,6 +61,8 @@ gb_LinkTarget__get_cxxflags=$(if $(CXXFLAGS),$(CXXFLAGS),$(call gb_LinkTarget__g
- gb_LinkTarget__get_objcxxflags=$(if $(OBJCXXFLAGS),$(OBJCXXFLAGS),$(call gb_LinkTarget__get_debugcxxflags,$(1)))
- gb_LinkTarget__get_ldflags=$(if $(LDFLAGS),$(LDFLAGS),$(call gb_LinkTarget__get_debugldflags,$(1)))
-
-+LDFLAGS += $(HARDEN_LDFLAGS)
-+
- # Overview of dependencies and tasks of LinkTarget
- #
- # target task depends on
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index e85ed83..1665642 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
-@@ -159,6 +159,9 @@ ifneq ($(strip $(ENVCFLAGSCXX)),)
- gb__ENV_CXXFLAGS := $(ENVCFLAGSCXX)
- endif
-
-+gb__ENV_CXXFLAGS += $(HARDEN_CXXFLAGS)
-+gb__ENV_CFLAGS += $(HARDEN_CFLAGS)
-+
- include $(GBUILDDIR)/ExternalExecutable.mk
- include $(GBUILDDIR)/Helper.mk
- include $(GBUILDDIR)/TargetLocations.mk
@@ -300,6 +303,8 @@ gb_GLOBALDEFS += \
HAVE_THREADSAFE_STATICS \
)
diff --git a/rules b/rules
index cd7b0fe..343ae93 100755
--- a/rules
+++ b/rules
@@ -612,6 +612,9 @@ ifeq "$(BUILD_DBG_PACKAGE)" "y"
endif
DBG_DBG_SUGGESTS+= , libc6.1-dbg [ia64], libc0.1-dbg [kfreebsd-i386 kfreebsd-amd64], libc0.3-dbg [hurd-i386], libc6-dbg [!ia64 !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libatk1.0-dbg, libglib2.0-0-dbg, libgnomevfs2-0-dbg, libstdc++6-$(SYSTEM_GCC_VERSION)-dbg, libx11-6-dbg, libxext6-dbg, libxaw7-dbg, libxml2-dbg, libgtk2.0-0-dbg, libxau6-dbg, libice6-dbg, libsm6-dbg, libxinerama1-dbg, libfontconfig1-dbg, libhunspell-$(shell pkg-config --modversion hunspell | cut -d. -f1,2)-0-dbg, libcurl4-dbg
endif
+
+export DPKG_EXPORT_BUILDFLAGS=y
+include /usr/share/dpkg/buildflags.mk
ifeq "$(ENABLE_SYMBOLS)" "y"
# Small symbols?
ifeq "$(SMALL_SYMBOLS)" "y"
@@ -1599,7 +1602,7 @@ $(STAMP_DIR)/build-arch:
--disable-ext-report-builder --disable-scripting-javascript \
--disable-scripting-beanshell
- PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(MAKE) build
+ PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build
ifeq "$(BUILD_PYUNO)" "y"
ifeq "$(ENABLE_PYTHON2)" "y"
@@ -1638,7 +1641,7 @@ $(STAMP_DIR)/build-indep:
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ./autogen.sh $(CONFIGURE_FLAGS) $(CONFIGURE_FLAGS_LANG)
- PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(MAKE) build
+ PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build
touch $@
--
LibreOffice packaging repository
Reply to: