[arch-commits] Commit in libreoffice/trunk (PKGBUILD)

andyrtr at archlinux.org andyrtr at archlinux.org
Sat May 21 07:47:52 UTC 2011


    Date: Saturday, May 21, 2011 @ 03:47:51
  Author: andyrtr
Revision: 124443

prepare 3.4 branch builds; add CFLAGS again

Modified:
  libreoffice/trunk/PKGBUILD

----------+
 PKGBUILD |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-20 20:07:24 UTC (rev 124442)
+++ PKGBUILD	2011-05-21 07:47:51 UTC (rev 124443)
@@ -214,7 +214,7 @@
 	done
 
 	cd ${srcdir}/build
-
+#return 1
 	# buildfixes & bugfixes
 	patch -Np1 -i ${srcdir}/buildfix_i116795.diff
 	patch -Np1 -i ${srcdir}/buildfix_boost.diff
@@ -223,11 +223,19 @@
 	
 	# unset C(XX)FLAGS
 	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
-	unset CFLAGS
-	unset CXXFLAGS
+#	unset CFLAGS
+#	unset CXXFLAGS
 
+	#use the CFLAGS but remove the LibO overridden ones
+	for i in $CFLAGS; do
+		case "$i" in
+			-O?|-pipe|-Wall|-g|-fexceptions) continue;;
+		esac
+        ARCH_FLAGS="$ARCH_FLAGS $i"
+	done
+
 	# workaround for bison2.5
-#	export CXXFLAGS="-fpermissive"
+#	export ARCH_FLAGS="$ARCH_FLAGS -fpermissive"
 	
 	# python2 fix
 	export PYTHON=python2




More information about the arch-commits mailing list