Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 172219 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-6 / +10 lines)
Line  Link Here
0
-- x11-libs/qt/qt-3.3.8-r3.ebuild
0
++ x11-libs/qt/qt-3.3.8-r3.ebuild
Lines 145-152 Link Here
145
	# set c/xxflags and ldflags
145
	# set c/xxflags and ldflags
146
	strip-flags
146
	strip-flags
147
	append-flags -fno-strict-aliasing
147
	append-flags -fno-strict-aliasing
148
	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
148
	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \
149
	       -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
149
	       -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \
150
	       -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
150
	       -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
151
		   -e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \
151
		   -e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \
152
		   -e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \
152
		   -e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \
Lines 158-163 Link Here
158
		sed -i -e "s:/lib$:/$(get_libdir):" \
158
		sed -i -e "s:/lib$:/$(get_libdir):" \
159
			${S}/mkspecs/${PLATFORM}/qmake.conf || die
159
			${S}/mkspecs/${PLATFORM}/qmake.conf || die
160
	fi
160
	fi
161
162
	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS} :" \
163
		   -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
164
		${S}/qmake/Makefile.unix
161
}
165
}
162
166
163
src_compile() {
167
src_compile() {
164
-- x11-libs/qt/qt-4.3.0-r1.ebuild
168
++ x11-libs/qt/qt-4.3.0-r1.ebuild
Lines 129-136 Link Here
129
	strip-flags
129
	strip-flags
130
	replace-flags -O3 -O2
130
	replace-flags -O3 -O2
131
131
132
	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
132
	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \
133
		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
133
		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \
134
		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
134
		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
135
		-e "/CONFIG/s:$: nostrip:" \
135
		-e "/CONFIG/s:$: nostrip:" \
136
		qmake.conf
136
		qmake.conf

Return to bug 172219