[libreoffice] make sure the new gbuild system gets these flags too
Caolan McNamara
caolanm at fedoraproject.org
Fri Jun 3 10:43:42 UTC 2011
commit 263625b18d345002de29b73a04d7425da52e9e0c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jun 3 11:43:15 2011 +0100
make sure the new gbuild system gets these flags too
libreoffice.spec | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index 0225bb6..2eaf42d 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -736,6 +736,17 @@ export QT4DIR=%{_qt4_prefix}
export KDE4DIR=%{_kde4_prefix}
export PATH=$QT4DIR/bin:$PATH
+#use the RPM_OPT_FLAGS but remove the OOo overridden ones
+for i in $RPM_OPT_FLAGS; do
+ case "$i" in
+ -O?|-pipe|-Wall|-g|-fexceptions) continue;;
+ esac
+ ARCH_FLAGS="$ARCH_FLAGS $i"
+done
+export ARCH_FLAGS
+export CFLAGS=$ARCH_FLAGS
+export CXXFLAGS=$ARCH_FLAGS
+
autoconf
%configure \
--with-vendor="Red Hat, Inc." --with-num-cpus=$NBUILDS --with-max-jobs=$NDMAKES \
@@ -772,15 +783,6 @@ cp %{SOURCE30} ext_sources
cp %{SOURCE31} ext_sources
touch src.downloaded
-#use the RPM_OPT_FLAGS but remove the OOo overridden ones
-for i in $RPM_OPT_FLAGS; do
- case "$i" in
- -O?|-pipe|-Wall|-g|-fexceptions) continue;;
- esac
- ARCH_FLAGS="$ARCH_FLAGS $i"
-done
-export ARCH_FLAGS
-
. ./*[Ee]nv.[Ss]et.sh
./bootstrap
More information about the scm-commits
mailing list