[Lsb-messages] /var/www/bzr/lsb/devel/packaging r562: Add -fpermissive to build flags for lsbdev-qt; needed for gcc 4.7.

Jeff Licquia licquia at linuxfoundation.org
Tue Mar 12 17:17:00 UTC 2013


------------------------------------------------------------
revno: 562
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: packaging
timestamp: Tue 2013-03-12 13:17:00 -0400
message:
  Add -fpermissive to build flags for lsbdev-qt; needed for gcc 4.7.
added:
  lsbdev-qt/qt-x11-opensource-src-4.2.3-fpermissive.patch
modified:
  lsbdev-qt/Makefile
  lsbdev-qt/linux-lsb/qmake.conf
  lsbdev-qt/lsb-build-qt4.spec.sed
-------------- next part --------------
=== modified file 'lsbdev-qt/Makefile'
--- a/lsbdev-qt/Makefile	2013-01-07 15:25:44 +0000
+++ b/lsbdev-qt/Makefile	2013-03-12 17:17:00 +0000
@@ -37,6 +37,7 @@
 	cp -pr qt-x11-opensource-src-4.2.3-ppc64.patch $(TMP_BUILD_DIR)
 	cp -pr qt-x11-opensource-src-4.2.3.patch $(TMP_BUILD_DIR)
 	cp -pr qt-x11-opensource-src-4.2.3-endian.patch $(TMP_BUILD_DIR)
+	cp -pr qt-x11-opensource-src-4.2.3-fpermissive.patch $(TMP_BUILD_DIR)
 	cd $(TMP_BUILD_DIR)/.. && tar cvfz $(PWD)/$(TARBALL) $(FULL_PACKAGE_NAME) && rm -rf $(TMP_BUILD_DIR)
 
 .PHONY : tarball rpm_package

=== modified file 'lsbdev-qt/linux-lsb/qmake.conf'
--- a/lsbdev-qt/linux-lsb/qmake.conf	2006-02-11 04:35:34 +0000
+++ b/lsbdev-qt/linux-lsb/qmake.conf	2013-03-12 17:17:00 +0000
@@ -16,7 +16,7 @@
 QMAKE_YACCFLAGS_MANGLE  = -p $base -b $base
 QMAKE_YACC_HEADER       = $base.tab.h
 QMAKE_YACC_SOURCE       = $base.tab.c
-QMAKE_CFLAGS		= -pipe
+QMAKE_CFLAGS		= -pipe -fpermissive
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	= -w

=== modified file 'lsbdev-qt/lsb-build-qt4.spec.sed'
--- a/lsbdev-qt/lsb-build-qt4.spec.sed	2012-03-28 03:48:55 +0000
+++ b/lsbdev-qt/lsb-build-qt4.spec.sed	2013-03-12 17:17:00 +0000
@@ -33,6 +33,7 @@
 patch -p0 < ../qt-x11-opensource-src-4.2.3-ppc64.patch
 patch -p0 < ../qt-x11-opensource-src-4.2.3.patch
 patch -p1 < ../qt-x11-opensource-src-4.2.3-endian.patch
+patch -p1 < ../qt-x11-opensource-src-4.2.3-fpermissive.patch
 
 ./configure \
 	--prefix=/opt/lsb \

=== added file 'lsbdev-qt/qt-x11-opensource-src-4.2.3-fpermissive.patch'
--- a/lsbdev-qt/qt-x11-opensource-src-4.2.3-fpermissive.patch	1970-01-01 00:00:00 +0000
+++ b/lsbdev-qt/qt-x11-opensource-src-4.2.3-fpermissive.patch	2013-03-12 17:17:00 +0000
@@ -0,0 +1,12 @@
+diff -ru qt-x11-opensource-src-4.2.3-orig/mkspecs/linux-lsb/qmake.conf qt-x11-opensource-src-4.2.3/mkspecs/linux-lsb/qmake.conf
+--- qt-x11-opensource-src-4.2.3-orig/mkspecs/linux-lsb/qmake.conf	2007-02-21 04:59:18.000000000 -0500
++++ qt-x11-opensource-src-4.2.3/mkspecs/linux-lsb/qmake.conf	2013-03-12 13:05:31.251193684 -0400
+@@ -16,7 +16,7 @@
+ QMAKE_YACCFLAGS_MANGLE  = -p $base -b $base
+ QMAKE_YACC_HEADER       = $base.tab.h
+ QMAKE_YACC_SOURCE       = $base.tab.c
+-QMAKE_CFLAGS		= -pipe -DQT_LSB
++QMAKE_CFLAGS		= -pipe -DQT_LSB -fpermissive
+ QMAKE_CFLAGS_DEPS	= -M
+ QMAKE_CFLAGS_WARN_ON	= -Wall -W
+ QMAKE_CFLAGS_WARN_OFF	= -w



More information about the lsb-messages mailing list