[patch] qt-FLAGS.patch

qt-FLAGS.patch (text/plain), 1.57 KB, created by Arfrever Frehtes Taifersar Arahesis (RETIRED) on 2007-08-02 21:48:18 UTC

--- x11-libs/qt/qt-3.3.8-r3.ebuild
+++ x11-libs/qt/qt-3.3.8-r3.ebuild
@@ -145,8 +145,8 @@
 	# set c/xxflags and ldflags
 	strip-flags
 	append-flags -fno-strict-aliasing
-	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
-	       -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
+	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \
+	       -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \
 	       -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
 		   -e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \
 		   -e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \
@@ -158,6 +158,10 @@
 		sed -i -e "s:/lib$:/$(get_libdir):" \
 			${S}/mkspecs/${PLATFORM}/qmake.conf || die
 	fi
+
+	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS} :" \
+		   -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
+		${S}/qmake/Makefile.unix
 }
 
 src_compile() {
--- x11-libs/qt/qt-4.3.0-r1.ebuild
+++ x11-libs/qt/qt-4.3.0-r1.ebuild
@@ -129,8 +129,8 @@
 	strip-flags
 	replace-flags -O3 -O2
 
-	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
-		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
+	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \
+		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \
 		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
 		-e "/CONFIG/s:$: nostrip:" \
 		qmake.conf