[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.1_rc1-2-77-g2810fe3
The following commit has been merged in the debian-experimental-4.1 branch:
commit b077545a1e24ec46139c0d78d58249bc5be1e06d
Author: Rene Engelhard <rene@debian.org>
Date: Tue Mar 12 16:28:54 2013 +0100
make opt and hardening patches apply again
diff --git a/patches/debian-hardened-buildflags-CPPFLAGS.diff b/patches/debian-hardened-buildflags-CPPFLAGS.diff
index 72faf0e..bc67685 100644
--- a/patches/debian-hardened-buildflags-CPPFLAGS.diff
+++ b/patches/debian-hardened-buildflags-CPPFLAGS.diff
@@ -14,14 +14,14 @@
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,7 @@
+@@ -72,6 +72,7 @@
export CPU=@CPU@
export CPUNAME=@CPUNAME@
export CDEFAULTOPT=@CDEFAULTOPT@
+export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@
- export CPUNAME_FOR_BUILD=@CPUNAME_FOR_BUILD@
- export CPU_FOR_BUILD=@CPU_FOR_BUILD@
export CROSS_COMPILING=@CROSS_COMPILING@
+ export CURL=@CURL@
+ export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index b0b6f92..530267b 100644
--- a/solenv/gbuild/gbuild.mk
diff --git a/patches/debian-opt.diff b/patches/debian-opt.diff
index 8cfdacd..be56536 100644
--- a/patches/debian-opt.diff
+++ b/patches/debian-opt.diff
@@ -14,11 +14,11 @@ index c0b76f8..d10222f 100644
dnl ===================================================================
--- a/config_host.mk.in-old 2012-04-06 14:08:12.755739649 +0200
+++ b/config_host.mk.in 2012-04-06 14:08:35.351739800 +0200
-@@ -74,6 +74,7 @@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@
+@@ -71,6 +71,7 @@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@
export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
export CPU=@CPU@
export CPUNAME=@CPUNAME@
+export CDEFAULTOPT=@CDEFAULTOPT@
- export CPUNAME_FOR_BUILD=@CPUNAME_FOR_BUILD@
- export CPU_FOR_BUILD=@CPU_FOR_BUILD@
export CROSS_COMPILING=@CROSS_COMPILING@
+ export CURL=@CURL@
+ export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@
--
LibreOffice packaging repository
Reply to: