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

Collapse All | Expand All

(-)cmake-3.19.1.ebuild.orig.txt (-2 / +14 lines)
Lines 18-31 Link Here
18
SLOT="0"
18
SLOT="0"
19
[[ "${PV}" = *_rc* ]] || \
19
[[ "${PV}" = *_rc* ]] || \
20
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
20
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
21
IUSE="doc emacs ncurses qt5 test"
21
IUSE="doc emacs ncurses qt5 +system-jsoncpp test"
22
#system-jsoncpp is only meant to be disabled during prefix bootstrapping
22
RESTRICT="!test? ( test )"
23
RESTRICT="!test? ( test )"
23
24
24
RDEPEND="
25
RDEPEND="
25
	>=app-arch/libarchive-3.3.3:=
26
	>=app-arch/libarchive-3.3.3:=
26
	app-crypt/rhash
27
	app-crypt/rhash
27
	>=dev-libs/expat-2.0.1
28
	>=dev-libs/expat-2.0.1
28
	>=dev-libs/jsoncpp-1.9.2-r2:0=
29
	system-jsoncpp? ( >=dev-libs/jsoncpp-1.9.2-r2:0= )
29
	>=dev-libs/libuv-1.10.0:=
30
	>=dev-libs/libuv-1.10.0:=
30
	>=net-misc/curl-7.21.5[ssl]
31
	>=net-misc/curl-7.21.5[ssl]
31
	sys-libs/zlib
32
	sys-libs/zlib
Lines 77-82 Link Here
77
		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
78
		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
78
		bootstrap || die "sed failed"
79
		bootstrap || die "sed failed"
79
80
81
	local sdk_frameworks="${EPREFIX}/MacOSX.sdk/System/Library/Frameworks"
82
	if [[ -d "${sdk_frameworks}" ]]; then
83
		# ensure frameworks are found for darwin prefix
84
		append-cflags $(test-flags-CC "-F${sdk_frameworks}")
85
		append-cxxflags $(test-flags-CXX "-F${sdk_frameworks}")
86
	fi
87
80
	# execinfo.h on Solaris isn't quite what it is on Darwin
88
	# execinfo.h on Solaris isn't quite what it is on Darwin
81
	if [[ ${CHOST} == *-solaris* ]] ; then
89
	if [[ ${CHOST} == *-solaris* ]] ; then
82
		sed -i -e 's/execinfo\.h/blablabla.h/' \
90
		sed -i -e 's/execinfo\.h/blablabla.h/' \
Lines 137-142 Link Here
137
		# where things are via GCC configuration and ldwrapper
145
		# where things are via GCC configuration and ldwrapper
138
		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
146
		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
139
			Modules/Platform/Apple-GNU-C{,XX}.cmake || die
147
			Modules/Platform/Apple-GNU-C{,XX}.cmake || die
148
		# disable isysroot usage with clang as well
149
		sed -i -e '/_SYSROOT_FLAG/d' \
150
			Modules/Platform/Apple-Clang.cmake || die
140
	fi
151
	fi
141
152
142
	# Add gcc libs to the default link paths
153
	# Add gcc libs to the default link paths
Lines 157-162 Link Here
157
168
158
	local mycmakeargs=(
169
	local mycmakeargs=(
159
		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
170
		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
171
		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
160
		-DCMAKE_DOC_DIR=/share/doc/${PF}
172
		-DCMAKE_DOC_DIR=/share/doc/${PF}
161
		-DCMAKE_MAN_DIR=/share/man
173
		-DCMAKE_MAN_DIR=/share/man
162
		-DCMAKE_DATA_DIR=/share/${PN}
174
		-DCMAKE_DATA_DIR=/share/${PN}

Return to bug 757513