The following commit has been merged in the debian-experimental-4.0 branch:
commit 4843789d8b83e2e2b3d20e54f4e9302142df2ca9
Author: Rene Engelhard <r...@debian.org>
Date: Thu Feb 14 21:29:35 2013 +0100
also make debian-opt.diff to use CFLAGS set by configure via buildflags.mk
diff --git a/patches/debian-opt.diff b/patches/debian-opt.diff
index 1b14b1f..c8c81cb 100644
--- a/patches/debian-opt.diff
+++ b/patches/debian-opt.diff
@@ -2,15 +2,11 @@ diff --git a/configure.ac b/configure.in
index c0b76f8..d10222f 100644
--- libreoffice-3.5.0/configure.ac
+++ libreoffice-3.5.0/configure.ac
-@@ -12091,6 +12108,13 @@ PRODUCTVERSION=AC_PACKAGE_VERSION
+@@ -12091,6 +12108,9 @@ PRODUCTVERSION=AC_PACKAGE_VERSION
AC_MSG_RESULT([$PRODUCTVERSION])
AC_SUBST(PRODUCTVERSION)
-+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
-+fi
++CDEFAULTOPT=`echo $CFLAGS 2>/dev/null | grep -E -o "\-O[[0-3]]"`
+AC_SUBST(CDEFAULTOPT)
+
dnl ===================================================================
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1u65r1-0001yq...@vasks.debian.org
