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-r2.ebuild
0
++ x11-libs/qt/qt-3.3.8-r2.ebuild
Lines 146-153 Link Here
146
	# set c/xxflags and ldflags
146
	# set c/xxflags and ldflags
147
	strip-flags
147
	strip-flags
148
	append-flags -fno-strict-aliasing
148
	append-flags -fno-strict-aliasing
149
	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
149
	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \
150
	       -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
150
	       -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \
151
	       -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
151
	       -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
152
		   -e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \
152
		   -e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \
153
		   -e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \
153
		   -e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \
Lines 159-164 Link Here
159
		sed -i -e "s:/lib$:/$(get_libdir):" \
159
		sed -i -e "s:/lib$:/$(get_libdir):" \
160
			${S}/mkspecs/${PLATFORM}/qmake.conf || die
160
			${S}/mkspecs/${PLATFORM}/qmake.conf || die
161
	fi
161
	fi
162
163
	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS} :" \
164
		   -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
165
		${S}/qmake/Makefile.unix
162
}
166
}
163
167
164
src_compile() {
168
src_compile() {
165
-- x11-libs/qt/qt-4.3.0_rc1.ebuild
169
++ x11-libs/qt/qt-4.3.0_rc1.ebuild
Lines 122-129 Link Here
122
	strip-flags
122
	strip-flags
123
	replace-flags -O3 -O2
123
	replace-flags -O3 -O2
124
124
125
	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
125
	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \
126
		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
126
		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \
127
		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
127
		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
128
		qmake.conf
128
		qmake.conf
129
129

Return to bug 172219