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

(-)cmake-2.8.12.2.ebuild.orig (-3 / +12 lines)
Lines 65-70 Link Here
65
	"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
65
	"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
66
	"${FILESDIR}"/${PN}-2.8.12.1-FindFreetype.patch
66
	"${FILESDIR}"/${PN}-2.8.12.1-FindFreetype.patch
67
	"${FILESDIR}"/${PN}-2.8.12.2-hppa-bootstrap.patch
67
	"${FILESDIR}"/${PN}-2.8.12.2-hppa-bootstrap.patch
68
	"${FILESDIR}"/${PN}-2.8.12.2-no-cross-docs.patch
68
)
69
)
69
70
70
cmake_src_bootstrap() {
71
cmake_src_bootstrap() {
Lines 83-92 Link Here
83
		sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
84
		sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
84
	fi
85
	fi
85
86
86
	tc-export CC CXX LD
87
88
	# bootstrap script isn't exactly /bin/sh compatible
87
	# bootstrap script isn't exactly /bin/sh compatible
89
	${CONFIG_SHELL:-sh} ./bootstrap \
88
	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
90
		--prefix="${T}/cmakestrap/" \
89
		--prefix="${T}/cmakestrap/" \
91
		${par_arg} \
90
		${par_arg} \
92
		|| die "Bootstrap failed"
91
		|| die "Bootstrap failed"
Lines 153-158 Link Here
153
		$(cmake-utils_use_build ncurses CursesDialog)
152
		$(cmake-utils_use_build ncurses CursesDialog)
154
	)
153
	)
155
154
155
	if tc-is-cross-compiler ; then
156
		mycmakeargs+=(-DKWSYS_LFS_WORKS=1)
157
158
		if use arm || use ppc ; then
159
			mycmakeargs+=(-DKWSYS_CHAR_IS_SIGNED=0)
160
		else
161
			mycmakeargs+=(-DKWSYS_CHAR_IS_SIGNED=1)
162
		fi
163
	fi
164
156
	if use qt4 || use qt5 ; then
165
	if use qt4 || use qt5 ; then
157
		mycmakeargs+=(
166
		mycmakeargs+=(
158
			-DBUILD_QtDialog=ON
167
			-DBUILD_QtDialog=ON

Return to bug 503218