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

Collapse All | Expand All

(-)a/dev-util/cmake/cmake-3.18.0.ebuild (-5 / +2 lines)
Lines 83-92 cmake_src_bootstrap() { Link Here
83
			Source/kwsys/CMakeLists.txt || die
83
			Source/kwsys/CMakeLists.txt || die
84
	fi
84
	fi
85
85
86
	tc-export CC CXX LD
87
88
	# bootstrap script isn't exactly /bin/sh compatible
86
	# bootstrap script isn't exactly /bin/sh compatible
89
	${CONFIG_SHELL:-sh} ./bootstrap \
87
	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
90
		--prefix="${T}/cmakestrap/" \
88
		--prefix="${T}/cmakestrap/" \
91
		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
89
		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
92
		|| die "Bootstrap failed"
90
		|| die "Bootstrap failed"
Lines 141-147 src_prepare() { Link Here
141
		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
139
		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
142
		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
140
		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
143
		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
141
		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
144
	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
142
	if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
145
		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
143
		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
146
		cmake_src_bootstrap
144
		cmake_src_bootstrap
147
	fi
145
	fi
148
- 

Return to bug 503218