[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0-2-39-ge667059
The following commit has been merged in the debian-experimental-3.5 branch:
commit e667059251cd96fa73ad71da0d2e1b4ccd34f24e
Author: Rene Engelhard <rene@debian.org>
Date: Fri Mar 2 21:53:34 2012 +0100
move all hardened build stuff into patch...
diff --git a/changelog b/changelog
index bc3c20a..91d5567 100644
--- a/changelog
+++ b/changelog
@@ -9,6 +9,8 @@ libreoffice (1:3.5.1~rc1-1) UNRELEASED; urgency=low
* debian/patches/nsplugin-fix-SimpleFileAccess-instance.diff:
fix nsplugin to create a correct com.sun.star.ucb.SimpleFileAccess
instance (closes: #661747)
+ * debian/patches/debian-hardened-buildflags.diff: use hardened
+ buildflags from dpkg-buildflags (closes: #656643)
* debian/rules, debian/components: rename ext-sources to src, as done
upstream
@@ -30,8 +32,6 @@ libreoffice (1:3.5.1~rc1-1) UNRELEASED; urgency=low
libc0.1-dev (= 2.13-26) [kfreebsd-i386 kfreebsd-amd64]
* debian/control.mozilla.in: stricten dependencies to 3.5, thanks
Mario Holbe for the observation
- * debian/rules, debian/patches/hardened-LDFLAGS.diff: use hardened
- buildflags from dpkg-buildflags (closes: #656643)
-- Rene Engelhard <rene@debian.org> Fri, 02 Mar 2012 20:46:23 +0100
diff --git a/patches/debian-hardened-buildflags.diff b/patches/debian-hardened-buildflags.diff
new file mode 100644
index 0000000..869af4f
--- /dev/null
+++ b/patches/debian-hardened-buildflags.diff
@@ -0,0 +1,51 @@
+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
+@@ -46,6 +46,8 @@ CXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
+ OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
+ endif
+
++LDFLAGS += "$(shell dpkg-buildflags --get 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
+ # from disk.
+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
+@@ -141,6 +141,9 @@ gb__ENV_CXXFLAGS := $(ENVCFLAGSCXX)
+ 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)
++
+ include $(GBUILDDIR)/Helper.mk
+ include $(GBUILDDIR)/TargetLocations.mk
+
+@@ -240,6 +243,8 @@ ifeq ($(HAVE_THREADSAFE_STATICS),TRUE)
+ gb_GLOBALDEFS += -DHAVE_THREADSAFE_STATICS
+ endif
+
++gb_GLOBALDEFS += $(shell dpkg-buildflags --get CPPFLAGS)
++
+ gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
+
+ include $(GBUILDDIR)/Deliver.mk
+diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
+index a3231a6..b97f354 100644
+--- a/solenv/inc/unxgcc.mk
++++ b/solenv/inc/unxgcc.mk
+@@ -233,6 +233,10 @@ LINKFLAGS += -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
+ 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)
++
+ # libraries for linking applications
+ STDLIBGUIMT+=-Wl,--as-needed $(DL_LIB) $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
+ STDLIBCUIMT+=-Wl,--as-needed $(DL_LIB) $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
diff --git a/patches/hardened-LDFLAGS.diff b/patches/hardened-LDFLAGS.diff
deleted file mode 100644
index c033fad..0000000
--- a/patches/hardened-LDFLAGS.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-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
-@@ -46,6 +46,8 @@ CXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
- OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
- endif
-
-+LDFLAGS += "$(shell dpkg-buildflags --get 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
- # from disk.
-diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
-index a3231a6..5a63144 100644
---- a/solenv/inc/unxgcc.mk
-+++ b/solenv/inc/unxgcc.mk
-@@ -233,6 +233,8 @@ LINKFLAGS += -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
- LINKFLAGS += -Wl,-zdynsort
- .ENDIF
-
-+LINKFLAGS += "$(shell dpkg-buildflags --get LDFLAGS)"
-+
- # libraries for linking applications
- STDLIBGUIMT+=-Wl,--as-needed $(DL_LIB) $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
- STDLIBCUIMT+=-Wl,--as-needed $(DL_LIB) $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
diff --git a/patches/series b/patches/series
index 3454ed3..7473ebf 100644
--- a/patches/series
+++ b/patches/series
@@ -31,4 +31,4 @@ move-binfilter-mimetypes-in-extra-desktop-file.diff
pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
armhf-bridges-doubles.diff
nsplugin-fix-SimpleFileAccess-instance.diff
-hardened-LDFLAGS.diff
+debian-hardened-buildflags.diff
diff --git a/rules b/rules
index a68501b..b7be177 100755
--- a/rules
+++ b/rules
@@ -633,9 +633,6 @@ ifeq (noopt,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
ARCH_FLAGS += -O0
endif
-# for the hardened build flags. LDFLAGS is done in hardeded-LDFLAGS.diff
-ARCH_FLAGS += "$(shell dpkg-buildflags --get CXXFLAGS | sed -e s/-g// | sed -e s/-O[0-3]//g) $(shell dpkg-buildflags --get CPPFLAGS)"
-
# Build python depends from current python version
PYMAJOR:=$(shell python -c "import sys; print sys.version_info[0]")
PYMINOR:=$(shell python -c "import sys; print sys.version_info[1]")
--
LibreOffice packaging repository
Reply to: