[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 ce56cca2234325fbd2c93dbc51686f72c981d7f0
Author: Rene Engelhard <rene@debian.org>
Date: Fri Mar 2 23:05:46 2012 +0100
make test for dpkg-buildflags work
diff --git a/patches/debian-hardened-buildflags.diff b/patches/debian-hardened-buildflags.diff
index 319638e..ddbe90d 100644
--- a/patches/debian-hardened-buildflags.diff
+++ b/patches/debian-hardened-buildflags.diff
@@ -4,10 +4,10 @@
fi
AC_SUBST(CDEFAULTOPT)
-+if [ -x /usr/bin/dpkg-buildflags ]; then
++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 CPPFLAGS 2>/dev/null`
++ HARDEN_CPPFLAGS=`dpkg-buildflags --get CPPFLAGS 2>/dev/null`
+ HARDEN_LDFLAGS=`dpkg-buildflags --get LDFLAGS 2>/dev/null`
+fi
+AC_SUBST(HARDEN_CFLAGS)
diff --git a/patches/debian-opt.diff b/patches/debian-opt.diff
index bc7f76d..0419820 100644
--- a/patches/debian-opt.diff
+++ b/patches/debian-opt.diff
@@ -6,7 +6,7 @@ index c0b76f8..d10222f 100644
AC_SUBST(GMAKE_PARALLELISM)
AC_SUBST(GMAKE_MODULE_PARALLELISM)
-+if [ -x /usr/bin/dpkg-buildflags ]; then
++if test -x /usr/bin/dpkg-buildflags; then
+ CDEFAULTOPT=`dpkg-buildflags --get CFLAGS 2>/dev/null | grep -E -o "\-O[0-3]"`
+else
+ CDEFAULTOPT=-O2
--
LibreOffice packaging repository
Reply to: