[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 4ff409a66929accb04b060b2c052886753697f62
Author: Rene Engelhard <rene@debian.org>
Date: Fri Mar 2 23:11:43 2012 +0100
[ -> [[ in configure.in for grep/sed
diff --git a/patches/debian-hardened-buildflags.diff b/patches/debian-hardened-buildflags.diff
index ddbe90d..e82dff4 100644
--- a/patches/debian-hardened-buildflags.diff
+++ b/patches/debian-hardened-buildflags.diff
@@ -5,8 +5,8 @@
AC_SUBST(CDEFAULTOPT)
+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_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
diff --git a/patches/debian-opt.diff b/patches/debian-opt.diff
index 0419820..65435cd 100644
--- a/patches/debian-opt.diff
+++ b/patches/debian-opt.diff
@@ -7,7 +7,7 @@ index c0b76f8..d10222f 100644
AC_SUBST(GMAKE_MODULE_PARALLELISM)
+if test -x /usr/bin/dpkg-buildflags; then
-+ CDEFAULTOPT=`dpkg-buildflags --get CFLAGS 2>/dev/null | grep -E -o "\-O[0-3]"`
++ CDEFAULTOPT=`dpkg-buildflags --get CFLAGS 2>/dev/null | grep -E -o "\-O[[0-3]]"`
+else
+ CDEFAULTOPT=-O2
+fi
--
LibreOffice packaging repository
Reply to: