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 156-163 Link Here
156
		append-flags -fno-stack-protector
156
		append-flags -fno-stack-protector
157
	fi
157
	fi
158
158
159
	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
159
	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \
160
	       -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
160
	       -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \
161
	       -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
161
	       -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
162
		   -e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \
162
		   -e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \
163
		   -e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \
163
		   -e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \
Lines 169-174 Link Here
169
		sed -i -e "s:/lib$:/$(get_libdir):" \
169
		sed -i -e "s:/lib$:/$(get_libdir):" \
170
			${S}/mkspecs/${PLATFORM}/qmake.conf || die
170
			${S}/mkspecs/${PLATFORM}/qmake.conf || die
171
	fi
171
	fi
172
173
	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS} :" \
174
		   -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
175
		${S}/qmake/Makefile.unix
172
}
176
}
173
177
174
src_compile() {
178
src_compile() {
175
-- x11-libs/qt/qt-4.3.3.ebuild
179
++ x11-libs/qt/qt-4.3.3.ebuild
Lines 132-139 Link Here
132
		append-flags -fno-stack-protector
132
		append-flags -fno-stack-protector
133
	fi
133
	fi
134
134
135
	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
135
	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \
136
		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
136
		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \
137
		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
137
		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
138
		-e "/CONFIG/s:$: nostrip:" \
138
		-e "/CONFIG/s:$: nostrip:" \
139
		qmake.conf
139
		qmake.conf

Return to bug 172219