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-r4.ebuild
0
++ x11-libs/qt/qt-3.3.8-r4.ebuild
Lines 150-157 Link Here
150
	# set c/xxflags and ldflags
150
	# set c/xxflags and ldflags
151
	strip-flags
151
	strip-flags
152
	append-flags -fno-strict-aliasing
152
	append-flags -fno-strict-aliasing
153
	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
153
	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \
154
	       -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
154
	       -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \
155
	       -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
155
	       -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
156
		   -e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \
156
		   -e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \
157
		   -e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \
157
		   -e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \
Lines 163-168 Link Here
163
		sed -i -e "s:/lib$:/$(get_libdir):" \
163
		sed -i -e "s:/lib$:/$(get_libdir):" \
164
			${S}/mkspecs/${PLATFORM}/qmake.conf || die
164
			${S}/mkspecs/${PLATFORM}/qmake.conf || die
165
	fi
165
	fi
166
167
	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS} :" \
168
		   -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
169
		${S}/qmake/Makefile.unix
166
}
170
}
167
171
168
src_compile() {
172
src_compile() {
169
-- x11-libs/qt/qt-4.3.1-r1.ebuild
173
++ x11-libs/qt/qt-4.3.1-r1.ebuild
Lines 131-138 Link Here
131
	strip-flags
131
	strip-flags
132
	replace-flags -O3 -O2
132
	replace-flags -O3 -O2
133
133
134
	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
134
	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \
135
		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
135
		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \
136
		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
136
		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
137
		-e "/CONFIG/s:$: nostrip:" \
137
		-e "/CONFIG/s:$: nostrip:" \
138
		qmake.conf
138
		qmake.conf

Return to bug 172219