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

Collapse All | Expand All

(-)file_not_specified_in_diff (-4 / +6 lines)
Line  Link Here
0
-- portage/eclass/qt5-build.eclass
0
++ portage/eclass/qt5-build.eclass
Lines 185-194 qt5-build_src_prepare() { Link Here
185
		fi
185
		fi
186
186
187
		# Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when bootstrapping qmake
187
		# Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when bootstrapping qmake
188
		sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s:): \
188
		sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s:): ${MAKEOPTS} ${EXTRA_EMAKE}&:" \
189
			${MAKEOPTS} ${EXTRA_EMAKE} 'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \
190
			'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&:" \
191
			-e 's/\(setBootstrapVariable\s\+\|EXTRA_C\(XX\)\?FLAGS=.*\)QMAKE_C\(XX\)\?FLAGS_\(DEBUG\|RELEASE\).*/:/' \
189
			-e 's/\(setBootstrapVariable\s\+\|EXTRA_C\(XX\)\?FLAGS=.*\)QMAKE_C\(XX\)\?FLAGS_\(DEBUG\|RELEASE\).*/:/' \
190
			-e "s|setBootstrapVariable\s+QMAKE_CC\s+C.*|echo 'CC = $(tc-getCC)' >> \"\$mkfile\"|" \
191
			-e "s|setBootstrapVariable\s+QMAKE_CXX\s+C.*|echo 'CXX = $(tc-getCC)' >> \"\$mkfile\"|" \
192
			-e "s|setBootstrapVariable\s+QMAKE_CXXFLAGS$|echo 'QMAKE_CXXFLAGS = ${CXXFLAGS}' >> \"\$mkfile\"|" \
193
			-e "s|setBootstrapVariable\s+QMAKE_LFLAGS$|echo 'QMAKE_LFLAGS = ${LDFLAGS}' >> \"\$mkfile\"|" \
192
			configure || die "sed failed (respect env for qmake build)"
194
			configure || die "sed failed (respect env for qmake build)"
193
		sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
195
		sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
194
			qmake/Makefile.unix || die "sed failed (CPPFLAGS for qmake build)"
196
			qmake/Makefile.unix || die "sed failed (CPPFLAGS for qmake build)"

Return to bug 633930