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

Collapse All | Expand All

(-)a/eclass/qt5-build.eclass (-15 / +10 lines)
Lines 198-218 qt5-build_src_prepare() { Link Here
198
		sed -i -e "/Creating qmake/i if [ '!' -e \"\$outpath/bin/qmake\" ]; then" \
198
		sed -i -e "/Creating qmake/i if [ '!' -e \"\$outpath/bin/qmake\" ]; then" \
199
			-e '/echo "Done."/a fi' configure || die "sed failed (skip qmake bootstrap)"
199
			-e '/echo "Done."/a fi' configure || die "sed failed (skip qmake bootstrap)"
200
200
201
		# Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when bootstrapping qmake
201
		sed -i -e 's/EXTRA_CXXFLAGS/CONFIG_CXXFLAGS/' -e 's/EXTRA_LFLAGS/CONFIG_LFLAGS/' configure || die
202
		sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s|)| \
203
			${MAKEOPTS} ${EXTRA_EMAKE} 'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \
204
			'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&|" \
205
			-e 's/\(setBootstrapVariable\s\+\|EXTRA_C\(XX\)\?FLAGS=.*\)QMAKE_C\(XX\)\?FLAGS_\(DEBUG\|RELEASE\).*/:/' \
206
			configure || die "sed failed (respect env for qmake build)"
207
		sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
208
			qmake/Makefile.unix || die "sed failed (CPPFLAGS for qmake build)"
209
210
		# Respect CXX in bsymbolic_functions, fvisibility, precomp, and a few other tests
211
		sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
212
			configure || die "sed failed (QMAKE_CONF_COMPILER)"
213
214
		# Respect build variables in configure tests (bug #639494)
215
		sed -i -e "s|\"\$outpath/bin/qmake\" \"\$relpathMangled\" -- \"\$@\"|& $(qt5_qmake_args) |" configure || die
216
	fi
202
	fi
217
203
218
	[[ -n ${QT5_KDEPATCHSET_REV} ]] && eapply "${WORKDIR}/${QT5_MODULE}-${PV}-gentoo-kde-${QT5_KDEPATCHSET_REV}"
204
	[[ -n ${QT5_KDEPATCHSET_REV} ]] && eapply "${WORKDIR}/${QT5_MODULE}-${PV}-gentoo-kde-${QT5_KDEPATCHSET_REV}"
Lines 240-245 qt5-build_src_configure() { Link Here
240
# Runs emake in the target directories.
226
# Runs emake in the target directories.
241
qt5-build_src_compile() {
227
qt5-build_src_compile() {
242
	qt5_foreach_target_subdir emake
228
	qt5_foreach_target_subdir emake
229
	if [[ ${PN} == qtcore ]]; then
230
		pushd "${QT5_BUILD_DIR}" >/dev/null || die
231
		emake sub-qmake-qmake-aux-pro
232
		popd >/dev/null || die
233
	fi
243
}
234
}
244
235
245
# @FUNCTION: qt5-build_src_test
236
# @FUNCTION: qt5-build_src_test
Lines 530-535 qt5_base_configure() { Link Here
530
	# setup toolchain variables used by configure
521
	# setup toolchain variables used by configure
531
	tc-export AR CC CXX OBJDUMP RANLIB STRIP
522
	tc-export AR CC CXX OBJDUMP RANLIB STRIP
532
	export LD="$(tc-getCXX)"
523
	export LD="$(tc-getCXX)"
524
	export EXTRA_CXXFLAGS="${CXXFLAGS}"
525
	export EXTRA_LFLAGS="${LDFLAGS}"
533
526
534
	# bug 633838
527
	# bug 633838
535
	unset QMAKESPEC XQMAKESPEC QMAKEPATH QMAKEFEATURES
528
	unset QMAKESPEC XQMAKESPEC QMAKEPATH QMAKEFEATURES
Lines 687-692 qt5_base_configure() { Link Here
687
		"${myconf[@]}"
680
		"${myconf[@]}"
688
	)
681
	)
689
682
683
	eval "conf+=($(qt5_qmake_args))"
684
690
	pushd "${QT5_BUILD_DIR}" >/dev/null || die
685
	pushd "${QT5_BUILD_DIR}" >/dev/null || die
691
686
692
	einfo "Configuring with: ${conf[@]}"
687
	einfo "Configuring with: ${conf[@]}"

Return to bug 649420