1 |
commit: 49f71dc215bb4d7337c826e7fbad8b1539e5ab81 |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 25 19:22:40 2014 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 25 19:22:40 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=49f71dc2 |
7 |
|
8 |
[dev-util/cmake] Improve boost python patch to fix libboost_python detection outside of portage wrt bug #500442. |
9 |
|
10 |
Package-Manager: portage-2.2.7 |
11 |
|
12 |
--- |
13 |
dev-util/cmake/cmake-2.8.12.2-r1.ebuild | 200 +++++++++++++++++++++ |
14 |
dev-util/cmake/files/50cmake-gentoo.el | 4 + |
15 |
.../files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 ++++ |
16 |
.../files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 ++ |
17 |
.../cmake/files/cmake-2.8.10-darwin-bundle.patch | 23 +++ |
18 |
.../cmake/files/cmake-2.8.10-darwin-isysroot.patch | 50 ++++++ |
19 |
dev-util/cmake/files/cmake-2.8.10-desktop.patch | 13 ++ |
20 |
dev-util/cmake/files/cmake-2.8.10-libform.patch | 51 ++++++ |
21 |
.../files/cmake-2.8.10.2-FindPythonInterp.patch | 22 +++ |
22 |
.../files/cmake-2.8.10.2-FindPythonLibs.patch | 24 +++ |
23 |
dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch | 48 +++++ |
24 |
.../files/cmake-2.8.11-more-no_host_paths.patch | 130 ++++++++++++++ |
25 |
.../files/cmake-2.8.11.2-hppa-bootstrap.patch | 20 +++ |
26 |
.../cmake/files/cmake-2.8.12.1-FindFreetype.patch | 43 +++++ |
27 |
.../files/cmake-2.8.12.1-FindImageMagick.patch | 23 +++ |
28 |
.../files/cmake-2.8.12.2-FindBoost-python.patch | 77 ++++++++ |
29 |
.../files/cmake-2.8.12.2-hppa-bootstrap.patch | 27 +++ |
30 |
dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch | 44 +++++ |
31 |
.../cmake/files/cmake-2.8.8-FindPkgConfig.patch | 18 ++ |
32 |
dev-util/cmake/files/cmake.vim | 3 + |
33 |
dev-util/cmake/metadata.xml | 5 + |
34 |
21 files changed, 883 insertions(+) |
35 |
|
36 |
diff --git a/dev-util/cmake/cmake-2.8.12.2-r1.ebuild b/dev-util/cmake/cmake-2.8.12.2-r1.ebuild |
37 |
new file mode 100644 |
38 |
index 0000000..c0a59db |
39 |
--- /dev/null |
40 |
+++ b/dev-util/cmake/cmake-2.8.12.2-r1.ebuild |
41 |
@@ -0,0 +1,200 @@ |
42 |
+# Copyright 1999-2014 Gentoo Foundation |
43 |
+# Distributed under the terms of the GNU General Public License v2 |
44 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.12.2.ebuild,v 1.2 2014/02/05 16:10:57 kensington Exp $ |
45 |
+ |
46 |
+EAPI=5 |
47 |
+ |
48 |
+CMAKE_REMOVE_MODULES="no" |
49 |
+inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx |
50 |
+ |
51 |
+MY_PV=${PV/_/-} |
52 |
+MY_P=${PN}-${MY_PV} |
53 |
+ |
54 |
+DESCRIPTION="Cross platform Make" |
55 |
+HOMEPAGE="http://www.cmake.org/" |
56 |
+SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz" |
57 |
+ |
58 |
+LICENSE="CMake" |
59 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
60 |
+SLOT="0" |
61 |
+IUSE="emacs ncurses qt4 qt5" |
62 |
+ |
63 |
+REQUIRED_USE="?? ( qt4 qt5 )" |
64 |
+ |
65 |
+DEPEND=" |
66 |
+ >=app-arch/libarchive-2.8.0:= |
67 |
+ >=dev-libs/expat-2.0.1 |
68 |
+ >=net-misc/curl-7.20.0-r1[ssl] |
69 |
+ sys-libs/zlib |
70 |
+ virtual/pkgconfig |
71 |
+ ncurses? ( sys-libs/ncurses ) |
72 |
+ qt4? ( |
73 |
+ dev-qt/qtcore:4 |
74 |
+ dev-qt/qtgui:4 |
75 |
+ ) |
76 |
+ qt5? ( |
77 |
+ dev-qt/qtcore:5 |
78 |
+ dev-qt/qtgui:5 |
79 |
+ dev-qt/qtwidgets:5 |
80 |
+ ) |
81 |
+" |
82 |
+RDEPEND="${DEPEND} |
83 |
+ emacs? ( virtual/emacs ) |
84 |
+" |
85 |
+ |
86 |
+S="${WORKDIR}/${MY_P}" |
87 |
+ |
88 |
+SITEFILE="50${PN}-gentoo.el" |
89 |
+ |
90 |
+CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" |
91 |
+ |
92 |
+PATCHES=( |
93 |
+ "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch |
94 |
+ "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch |
95 |
+ "${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch |
96 |
+ "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch |
97 |
+ "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch |
98 |
+ "${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch |
99 |
+ "${FILESDIR}"/${PN}-2.8.10-desktop.patch |
100 |
+ "${FILESDIR}"/${PN}-2.8.10-libform.patch |
101 |
+ "${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch |
102 |
+ "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch |
103 |
+ "${FILESDIR}"/${PN}-2.8.11-FindBLAS.patch |
104 |
+ "${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.patch |
105 |
+ "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch |
106 |
+ "${FILESDIR}"/${PN}-2.8.12.1-FindFreetype.patch |
107 |
+ "${FILESDIR}"/${PN}-2.8.12.2-hppa-bootstrap.patch |
108 |
+ "${FILESDIR}"/${PN}-2.8.12.2-FindBoost-python.patch |
109 |
+) |
110 |
+ |
111 |
+cmake_src_bootstrap() { |
112 |
+ # Cleanup args to extract only JOBS. |
113 |
+ # Because bootstrap does not know anything else. |
114 |
+ echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null |
115 |
+ if [ $? -eq 0 ]; then |
116 |
+ par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+') |
117 |
+ par_arg="--parallel=${par_arg}" |
118 |
+ else |
119 |
+ par_arg="--parallel=1" |
120 |
+ fi |
121 |
+ |
122 |
+ # execinfo.h on Solaris isn't quite what it is on Darwin |
123 |
+ if [[ ${CHOST} == *-solaris* ]] ; then |
124 |
+ sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die |
125 |
+ fi |
126 |
+ |
127 |
+ tc-export CC CXX LD |
128 |
+ |
129 |
+ # bootstrap script isn't exactly /bin/sh compatible |
130 |
+ ${CONFIG_SHELL:-sh} ./bootstrap \ |
131 |
+ --prefix="${T}/cmakestrap/" \ |
132 |
+ ${par_arg} \ |
133 |
+ || die "Bootstrap failed" |
134 |
+} |
135 |
+ |
136 |
+cmake_src_test() { |
137 |
+ # fix OutDir and SelectLibraryConfigurations tests |
138 |
+ # these are altered thanks to our eclass |
139 |
+ sed -i -e 's:#IGNORE ::g' \ |
140 |
+ "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ |
141 |
+ || die |
142 |
+ |
143 |
+ pushd "${BUILD_DIR}" > /dev/null |
144 |
+ |
145 |
+ local ctestargs |
146 |
+ [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" |
147 |
+ |
148 |
+ # Excluded tests: |
149 |
+ # BootstrapTest: we actualy bootstrap it every time so why test it. |
150 |
+ # CTest.updatecvs, which fails to commit as root |
151 |
+ # Qt4Deploy, which tries to break sandbox and ignores prefix |
152 |
+ # TestUpload, which requires network access |
153 |
+ "${BUILD_DIR}"/bin/ctest ${ctestargs} \ |
154 |
+ -E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \ |
155 |
+ || die "Tests failed" |
156 |
+ |
157 |
+ popd > /dev/null |
158 |
+} |
159 |
+ |
160 |
+pkg_setup() { |
161 |
+ # bug 387227 |
162 |
+ addpredict /proc/self/coredump_filter |
163 |
+} |
164 |
+ |
165 |
+src_prepare() { |
166 |
+ cmake-utils_src_prepare |
167 |
+ |
168 |
+ # disable running of cmake in boostrap command |
169 |
+ sed -i \ |
170 |
+ -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ |
171 |
+ bootstrap || die "sed failed" |
172 |
+ |
173 |
+ # Add gcc libs to the default link paths |
174 |
+ sed -i \ |
175 |
+ -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ |
176 |
+ -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ |
177 |
+ Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" |
178 |
+ |
179 |
+ cmake_src_bootstrap |
180 |
+} |
181 |
+ |
182 |
+src_configure() { |
183 |
+ # make things work with gentoo java setup |
184 |
+ # in case java-config cannot be run, the variable just becomes unset |
185 |
+ # per bug #315229 |
186 |
+ export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null) |
187 |
+ |
188 |
+ local mycmakeargs=( |
189 |
+ -DCMAKE_USE_SYSTEM_LIBRARIES=ON |
190 |
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr |
191 |
+ -DCMAKE_DOC_DIR=/share/doc/${PF} |
192 |
+ -DCMAKE_MAN_DIR=/share/man |
193 |
+ -DCMAKE_DATA_DIR=/share/${PN} |
194 |
+ $(cmake-utils_use_build ncurses CursesDialog) |
195 |
+ ) |
196 |
+ |
197 |
+ if use qt4 || use qt5 ; then |
198 |
+ mycmakeargs+=( |
199 |
+ -DBUILD_QtDialog=ON |
200 |
+ $(cmake-utils_use_find_package qt5 Qt5Widgets) |
201 |
+ ) |
202 |
+ fi |
203 |
+ cmake-utils_src_configure |
204 |
+} |
205 |
+ |
206 |
+src_compile() { |
207 |
+ cmake-utils_src_compile |
208 |
+ use emacs && elisp-compile Docs/cmake-mode.el |
209 |
+} |
210 |
+ |
211 |
+src_test() { |
212 |
+ VIRTUALX_COMMAND="cmake_src_test" virtualmake |
213 |
+} |
214 |
+ |
215 |
+src_install() { |
216 |
+ cmake-utils_src_install |
217 |
+ if use emacs; then |
218 |
+ elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc |
219 |
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
220 |
+ fi |
221 |
+ |
222 |
+ insinto /usr/share/vim/vimfiles/syntax |
223 |
+ doins Docs/cmake-syntax.vim |
224 |
+ |
225 |
+ insinto /usr/share/vim/vimfiles/indent |
226 |
+ doins Docs/cmake-indent.vim |
227 |
+ |
228 |
+ insinto /usr/share/vim/vimfiles/ftdetect |
229 |
+ doins "${FILESDIR}/${PN}.vim" |
230 |
+ |
231 |
+ dobashcomp Docs/bash-completion/{${PN},ctest,cpack} |
232 |
+ rm -rf "${D}/usr/share/cmake/completions" || die |
233 |
+} |
234 |
+ |
235 |
+pkg_postinst() { |
236 |
+ use emacs && elisp-site-regen |
237 |
+} |
238 |
+ |
239 |
+pkg_postrm() { |
240 |
+ use emacs && elisp-site-regen |
241 |
+} |
242 |
|
243 |
diff --git a/dev-util/cmake/files/50cmake-gentoo.el b/dev-util/cmake/files/50cmake-gentoo.el |
244 |
new file mode 100644 |
245 |
index 0000000..e4a1a6d |
246 |
--- /dev/null |
247 |
+++ b/dev-util/cmake/files/50cmake-gentoo.el |
248 |
@@ -0,0 +1,4 @@ |
249 |
+(add-to-list 'load-path "@SITELISP@") |
250 |
+(autoload 'cmake-mode "cmake-mode" "Major mode for editing CMake files." t) |
251 |
+(add-to-list 'auto-mode-alist '("CMakeLists\\.txt\\'" . cmake-mode)) |
252 |
+(add-to-list 'auto-mode-alist '("\\.cmake\\'" . cmake-mode)) |
253 |
|
254 |
diff --git a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch |
255 |
new file mode 100644 |
256 |
index 0000000..02c3011 |
257 |
--- /dev/null |
258 |
+++ b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch |
259 |
@@ -0,0 +1,39 @@ |
260 |
+http://public.kitware.com/Bug/view.php?id=7933 |
261 |
+ |
262 |
+diff -ur cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx |
263 |
+--- cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx Wed Sep 24 20:34:37 2008 |
264 |
++++ cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx Tue Nov 4 11:18:32 2008 |
265 |
+@@ -38,6 +38,13 @@ |
266 |
+ int main() { return 0; } |
267 |
+ #endif |
268 |
+ |
269 |
++#ifdef TEST_KWSYS_LFS_SUPPORT |
270 |
++#define _LARGE_FILES |
271 |
++#include <iostream> |
272 |
++int main() { return 0; } |
273 |
++#endif |
274 |
++ |
275 |
++ |
276 |
+ #ifdef TEST_KWSYS_IOS_HAVE_STD |
277 |
+ #include <iosfwd> |
278 |
+ void f(std ::ostream*) {} |
279 |
+diff -ur cmake-2.6.2/bootstrap cmake-2.6.2-p/bootstrap |
280 |
+--- cmake-2.6.2/bootstrap Wed Sep 24 20:34:33 2008 |
281 |
++++ cmake-2.6.2-p/bootstrap Tue Nov 4 11:17:11 2008 |
282 |
+@@ -1005,6 +1005,16 @@ |
283 |
+ echo "${cmake_cxx_compiler} does not have stl iterator_traits" |
284 |
+ fi |
285 |
+ |
286 |
++if cmake_try_run "${cmake_cxx_compiler}" \ |
287 |
++ "${cmake_cxx_flags} -DTEST_KWSYS_LFS_SUPPORT" \ |
288 |
++ "${cmake_source_dir}/Source/kwsys/kwsysPlatformTestsCXX.cxx" >> cmake_bootstrap.log 2>&1; then |
289 |
++ KWSYS_LFS_AVAILABLE=1 |
290 |
++ echo "LFS support available" |
291 |
++else |
292 |
++ KWSYS_LFS_AVAILABLE=0 |
293 |
++ echo "LFS support unavailable, disabled" |
294 |
++fi |
295 |
++ |
296 |
+ if [ "x${KWSYS_STL_HAS_ITERATOR_TRAITS}" = "x0" ]; then |
297 |
+ if cmake_try_run "${cmake_cxx_compiler}" \ |
298 |
+ "${cmake_cxx_flags} -DTEST_KWSYS_STL_HAS_ITERATOR_CATEGORY -DKWSYS_STL_HAVE_STD=${KWSYS_STL_HAVE_STD}" \ |
299 |
|
300 |
diff --git a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch b/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch |
301 |
new file mode 100644 |
302 |
index 0000000..ceb205f |
303 |
--- /dev/null |
304 |
+++ b/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch |
305 |
@@ -0,0 +1,19 @@ |
306 |
+Patch by Heiko Przybyl |
307 |
+ |
308 |
+--- Source/cmComputeLinkInformation.cxx |
309 |
++++ Source/cmComputeLinkInformation.cxx |
310 |
+@@ -1686,6 +1686,14 @@ std::string cmComputeLinkInformation::Ge |
311 |
+ for(std::vector<std::string>::const_iterator ri = runtimeDirs.begin(); |
312 |
+ ri != runtimeDirs.end(); ++ri) |
313 |
+ { |
314 |
++ // Do not add duplicates. |
315 |
++ // I'd like to have that check already in the list generation code |
316 |
++ // but that would need lots of more changes, even in ExpandListArgument(). |
317 |
++ if(*sep != '\0' && (rpath + sep).find(*ri + sep) != std::string::npos) |
318 |
++ { |
319 |
++ //std::cerr << "ignoring duplicate: '" << *ri << "' in '" << rpath << "'" << std::endl; |
320 |
++ continue; |
321 |
++ } |
322 |
+ // Separate from previous path. |
323 |
+ rpath += sep; |
324 |
+ sep = this->GetRuntimeSep().c_str(); |
325 |
|
326 |
diff --git a/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch |
327 |
new file mode 100644 |
328 |
index 0000000..9cb4777 |
329 |
--- /dev/null |
330 |
+++ b/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch |
331 |
@@ -0,0 +1,23 @@ |
332 |
+Don't use .so for modules on darwin/macos. Use .bundle instead. |
333 |
+Patch by Heiko Przybyl |
334 |
+ |
335 |
+--- Modules/Platform/Darwin.cmake |
336 |
++++ Modules/Platform/Darwin.cmake |
337 |
+@@ -26,7 +26,7 @@ |
338 |
+ set(CMAKE_SHARED_LIBRARY_PREFIX "lib") |
339 |
+ set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib") |
340 |
+ set(CMAKE_SHARED_MODULE_PREFIX "lib") |
341 |
+-set(CMAKE_SHARED_MODULE_SUFFIX ".so") |
342 |
++set(CMAKE_SHARED_MODULE_SUFFIX ".bundle") |
343 |
+ set(CMAKE_MODULE_EXISTS 1) |
344 |
+ set(CMAKE_DL_LIBS "") |
345 |
+ |
346 |
+@@ -48,7 +48,7 @@ |
347 |
+ set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -Wl,-headerpad_max_install_names") |
348 |
+ set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,") |
349 |
+ set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,") |
350 |
+-set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a") |
351 |
++set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".bundle" ".a") |
352 |
+ |
353 |
+ # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree |
354 |
+ # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache |
355 |
|
356 |
diff --git a/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch b/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch |
357 |
new file mode 100644 |
358 |
index 0000000..97c93aa |
359 |
--- /dev/null |
360 |
+++ b/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch |
361 |
@@ -0,0 +1,50 @@ |
362 |
+Do not detect Xcode and set -isysroot for its SDK, since that messes up |
363 |
+our toolchain, and hence makes any compilation fail, bug #445308 |
364 |
+ |
365 |
+--- Modules/Platform/Darwin.cmake |
366 |
++++ Modules/Platform/Darwin.cmake |
367 |
+@@ -60,18 +60,18 @@ |
368 |
+ endif() |
369 |
+ |
370 |
+ # Ask xcode-select where to find /Developer or fall back to ancient location. |
371 |
+-execute_process(COMMAND xcode-select -print-path |
372 |
+- OUTPUT_VARIABLE _stdout |
373 |
+- OUTPUT_STRIP_TRAILING_WHITESPACE |
374 |
+- ERROR_VARIABLE _stderr |
375 |
+- RESULT_VARIABLE _failed) |
376 |
+-if(NOT _failed AND IS_DIRECTORY ${_stdout}) |
377 |
+- set(OSX_DEVELOPER_ROOT ${_stdout}) |
378 |
+-elseif(IS_DIRECTORY "/Developer") |
379 |
+- set(OSX_DEVELOPER_ROOT "/Developer") |
380 |
+-else() |
381 |
++#execute_process(COMMAND xcode-select -print-path |
382 |
++# OUTPUT_VARIABLE _stdout |
383 |
++# OUTPUT_STRIP_TRAILING_WHITESPACE |
384 |
++# ERROR_VARIABLE _stderr |
385 |
++# RESULT_VARIABLE _failed) |
386 |
++#if(NOT _failed AND IS_DIRECTORY ${_stdout}) |
387 |
++# set(OSX_DEVELOPER_ROOT ${_stdout}) |
388 |
++#elseif(IS_DIRECTORY "/Developer") |
389 |
++# set(OSX_DEVELOPER_ROOT "/Developer") |
390 |
++#else() |
391 |
+ set(OSX_DEVELOPER_ROOT "") |
392 |
+-endif() |
393 |
++#endif() |
394 |
+ |
395 |
+ execute_process(COMMAND sw_vers -productVersion |
396 |
+ OUTPUT_VARIABLE CURRENT_OSX_VERSION |
397 |
+@@ -91,10 +91,10 @@ |
398 |
+ # CMAKE_OSX_DEPLOYMENT_TARGET |
399 |
+ |
400 |
+ # Set cache variable - end user may change this during ccmake or cmake-gui configure. |
401 |
+-if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3) |
402 |
+- set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING |
403 |
+- "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.") |
404 |
+-endif() |
405 |
++#if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3) |
406 |
++# set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING |
407 |
++# "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.") |
408 |
++#endif() |
409 |
+ |
410 |
+ #---------------------------------------------------------------------------- |
411 |
+ # CMAKE_OSX_SYSROOT |
412 |
|
413 |
diff --git a/dev-util/cmake/files/cmake-2.8.10-desktop.patch b/dev-util/cmake/files/cmake-2.8.10-desktop.patch |
414 |
new file mode 100644 |
415 |
index 0000000..e0cefa9 |
416 |
--- /dev/null |
417 |
+++ b/dev-util/cmake/files/cmake-2.8.10-desktop.patch |
418 |
@@ -0,0 +1,13 @@ |
419 |
+diff --git a/Source/QtDialog/CMake.desktop b/Source/QtDialog/CMake.desktop |
420 |
+index 645eb76..7be495f 100644 |
421 |
+--- a/Source/QtDialog/CMake.desktop |
422 |
++++ b/Source/QtDialog/CMake.desktop |
423 |
+@@ -3,7 +3,7 @@ Version=1.0 |
424 |
+ Name=CMake |
425 |
+ Comment=Cross-platform buildsystem |
426 |
+ Exec=cmake-gui %f |
427 |
+-Icon=CMakeSetup32.png |
428 |
++Icon=CMakeSetup32 |
429 |
+ Terminal=false |
430 |
+ X-MultipleArgs=false |
431 |
+ Type=Application |
432 |
|
433 |
diff --git a/dev-util/cmake/files/cmake-2.8.10-libform.patch b/dev-util/cmake/files/cmake-2.8.10-libform.patch |
434 |
new file mode 100644 |
435 |
index 0000000..052cc30 |
436 |
--- /dev/null |
437 |
+++ b/dev-util/cmake/files/cmake-2.8.10-libform.patch |
438 |
@@ -0,0 +1,51 @@ |
439 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
440 |
+index ea1c033..ae479ce 100644 |
441 |
+--- a/CMakeLists.txt |
442 |
++++ b/CMakeLists.txt |
443 |
+@@ -395,9 +395,6 @@ macro (CMAKE_BUILD_UTILITIES) |
444 |
+ else () |
445 |
+ set(BUILD_CursesDialog 0) |
446 |
+ endif () |
447 |
+- if(BUILD_CursesDialog) |
448 |
+- add_subdirectory(Source/CursesDialog/form) |
449 |
+- endif() |
450 |
+ endmacro () |
451 |
+ |
452 |
+ #----------------------------------------------------------------------- |
453 |
+diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt |
454 |
+index 96e28b4..4102379 100644 |
455 |
+--- a/Source/CursesDialog/CMakeLists.txt |
456 |
++++ b/Source/CursesDialog/CMakeLists.txt |
457 |
+@@ -25,13 +25,16 @@ set( CURSES_SRCS |
458 |
+ CursesDialog/ccmake |
459 |
+ ) |
460 |
+ |
461 |
+-include_directories(${CMake_SOURCE_DIR}/Source/CursesDialog/form |
462 |
+- ${CMake_BINARY_DIR}/Source/CursesDialog/form) |
463 |
+ include_directories(${CURSES_INCLUDE_PATH}) |
464 |
+ |
465 |
+ |
466 |
+ add_executable(ccmake ${CURSES_SRCS} ) |
467 |
+ target_link_libraries(ccmake CMakeLib) |
468 |
+-target_link_libraries(ccmake cmForm) |
469 |
++TARGET_LINK_LIBRARIES(ccmake form) |
470 |
++TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY}) |
471 |
++IF(CURSES_EXTRA_LIBRARY) |
472 |
++ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY}) |
473 |
++ENDIF(CURSES_EXTRA_LIBRARY) |
474 |
++ |
475 |
+ |
476 |
+ install_targets(/bin ccmake) |
477 |
+diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h |
478 |
+index b157a28..f131ea4 100644 |
479 |
+--- a/Source/CursesDialog/cmCursesStandardIncludes.h |
480 |
++++ b/Source/CursesDialog/cmCursesStandardIncludes.h |
481 |
+@@ -15,8 +15,6 @@ |
482 |
+ #define _MSE_INT_H |
483 |
+ #endif |
484 |
+ |
485 |
+-#include <cmFormConfigure.h> |
486 |
+- |
487 |
+ #if defined(__hpux) |
488 |
+ # define _BOOL_DEFINED |
489 |
+ # include <sys/time.h> |
490 |
|
491 |
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch |
492 |
new file mode 100644 |
493 |
index 0000000..a7e8688 |
494 |
--- /dev/null |
495 |
+++ b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch |
496 |
@@ -0,0 +1,22 @@ |
497 |
+--- Modules/FindPythonInterp.cmake |
498 |
++++ Modules/FindPythonInterp.cmake |
499 |
+@@ -60,6 +60,10 @@ |
500 |
+ |
501 |
+ list(APPEND _Python_NAMES python) |
502 |
+ |
503 |
++if (CMAKE_BUILD_TYPE STREQUAL Gentoo) |
504 |
++ set(_Python_NAMES python) |
505 |
++endif() |
506 |
++ |
507 |
+ # Search for the current active python version first |
508 |
+ find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES}) |
509 |
+ |
510 |
+@@ -76,7 +80,7 @@ |
511 |
+ unset(_PYTHON3_VERSIONS) |
512 |
+ |
513 |
+ # Search for newest python version if python executable isn't found |
514 |
+-if(NOT PYTHON_EXECUTABLE) |
515 |
++if(NOT PYTHON_EXECUTABLE AND NOT CMAKE_BUILD_TYPE STREQUAL Gentoo) |
516 |
+ foreach(_CURRENT_VERSION ${_Python_VERSIONS}) |
517 |
+ set(_Python_NAMES python${_CURRENT_VERSION}) |
518 |
+ if(WIN32) |
519 |
|
520 |
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch |
521 |
new file mode 100644 |
522 |
index 0000000..2a83ff7 |
523 |
--- /dev/null |
524 |
+++ b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch |
525 |
@@ -0,0 +1,24 @@ |
526 |
+diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake |
527 |
+index bffa9fb..8fc90ee 100644 |
528 |
+--- a/Modules/FindPythonLibs.cmake |
529 |
++++ b/Modules/FindPythonLibs.cmake |
530 |
+@@ -74,6 +74,19 @@ set(_Python_VERSIONS |
531 |
+ ${_PYTHON_FIND_OTHER_VERSIONS} |
532 |
+ ) |
533 |
+ |
534 |
++# Gentoo portage requires that you use exactly the given python version |
535 |
++if (CMAKE_BUILD_TYPE STREQUAL Gentoo) |
536 |
++ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))" |
537 |
++ OUTPUT_VARIABLE _Gentoo_Python_VERSION) |
538 |
++ list(FIND _Python_VERSIONS "${_Gentoo_Python_VERSION}" _Gentoo_Python_INDEX) |
539 |
++ if (_Gentoo_Python_INDEX EQUAL -1) |
540 |
++ # the current Gentoo python version is not compatible with what is requested |
541 |
++ set(_Python_VERSIONS) |
542 |
++ else () |
543 |
++ set(_Python_VERSIONS "${_Gentoo_Python_VERSION}") |
544 |
++ endif () |
545 |
++endif() |
546 |
++ |
547 |
+ unset(_PYTHON_FIND_OTHER_VERSIONS) |
548 |
+ unset(_PYTHON1_VERSIONS) |
549 |
+ unset(_PYTHON2_VERSIONS) |
550 |
|
551 |
diff --git a/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch |
552 |
new file mode 100644 |
553 |
index 0000000..02e44fb |
554 |
--- /dev/null |
555 |
+++ b/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch |
556 |
@@ -0,0 +1,48 @@ |
557 |
+--- b/Modules/FindBLAS.cmake |
558 |
++++ a/Modules/FindBLAS.cmake |
559 |
+@@ -1,3 +1,9 @@ |
560 |
++# |
561 |
++# Version modified for Gentoo Linux |
562 |
++# If a valid PkgConfig configuration for blas is found, this overrides and cancels |
563 |
++# all further checks. |
564 |
++# |
565 |
++ |
566 |
+ # - Find BLAS library |
567 |
+ # This module finds an installed fortran library that implements the BLAS |
568 |
+ # linear-algebra interface (see http://www.netlib.org/blas/). |
569 |
+@@ -40,6 +46,26 @@ |
570 |
+ # (To distribute this file outside of CMake, substitute the full |
571 |
+ # License text for the above reference.) |
572 |
+ |
573 |
++# |
574 |
++# first, try PkgConfig |
575 |
++# |
576 |
++find_package(PkgConfig REQUIRED) |
577 |
++pkg_check_modules(PC_BLAS blas) |
578 |
++if(PC_BLAS_FOUND) |
579 |
++ foreach(PC_LIB ${PC_BLAS_LIBRARIES}) |
580 |
++ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_BLAS_LIBRARY_DIRS} ) |
581 |
++ if (NOT ${PC_LIB}_LIBRARY) |
582 |
++ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_BLAS_LIBRARY_DIRS}") |
583 |
++ endif (NOT ${PC_LIB}_LIBRARY) |
584 |
++ list(APPEND BLAS_LIBRARIES ${${PC_LIB}_LIBRARY}) |
585 |
++ endforeach(PC_LIB) |
586 |
++ find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARIES) |
587 |
++ mark_as_advanced(BLAS_LIBRARIES) |
588 |
++else(PC_BLAS_FOUND) |
589 |
++message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.") |
590 |
++ |
591 |
++ |
592 |
++ |
593 |
+ include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake) |
594 |
+ include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake) |
595 |
+ |
596 |
+@@ -604,3 +630,8 @@ |
597 |
+ endif() |
598 |
+ |
599 |
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) |
600 |
++ |
601 |
++ |
602 |
++endif(PC_BLAS_FOUND) |
603 |
++ |
604 |
++ |
605 |
|
606 |
diff --git a/dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch |
607 |
new file mode 100644 |
608 |
index 0000000..36f4ded |
609 |
--- /dev/null |
610 |
+++ b/dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch |
611 |
@@ -0,0 +1,130 @@ |
612 |
+From 65571942d4f19d508174f6f89aeaac5ffe380a6e Mon Sep 17 00:00:00 2001 |
613 |
+From: Michael Palimaka <kensington@g.o> |
614 |
+Date: Tue, 6 Nov 2012 23:35:34 +1100 |
615 |
+Subject: [PATCH] Set some proper paths to make cmake find our tools. |
616 |
+ |
617 |
+The ebuild now adds an extra / at the end of $EPREFIX so that it is |
618 |
+never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains |
619 |
+correct) |
620 |
+ |
621 |
+Original patch by Heiko Przybyl. |
622 |
+Updated by Chris Reffett (cmake-2.8.8) |
623 |
+Updated by Johannes Huber (cmake-2.8.9) |
624 |
+Updated by Michael Palimaka (cmake-2.8.10) |
625 |
+Updated by Chris Reffett (cmake-2.8.11) |
626 |
+ |
627 |
+--- a/Modules/Platform/Darwin.cmake |
628 |
++++ b/Modules/Platform/Darwin.cmake |
629 |
+@@ -252,9 +252,9 @@ |
630 |
+ "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <LINK_FLAGS> -o <TARGET> <SONAME_FLAG> <TARGET_INSTALLNAME_DIR><TARGET_SONAME> <OBJECTS> <LINK_LIBRARIES>") |
631 |
+ |
632 |
+ |
633 |
+-# default to searching for frameworks first |
634 |
++# default to searching for frameworks last |
635 |
+ if(NOT DEFINED CMAKE_FIND_FRAMEWORK) |
636 |
+- set(CMAKE_FIND_FRAMEWORK FIRST) |
637 |
++ set(CMAKE_FIND_FRAMEWORK LAST) |
638 |
+ endif() |
639 |
+ |
640 |
+ # Older OS X linkers do not report their framework search path |
641 |
+@@ -276,6 +276,8 @@ |
642 |
+ |
643 |
+ # set up the default search directories for frameworks |
644 |
+ set(CMAKE_SYSTEM_FRAMEWORK_PATH |
645 |
++ @GENTOO_PORTAGE_EPREFIX@Frameworks |
646 |
++ @GENTOO_PORTAGE_EPREFIX@usr/lib |
647 |
+ ~/Library/Frameworks |
648 |
+ /Library/Frameworks |
649 |
+ /Network/Library/Frameworks |
650 |
+@@ -298,13 +300,15 @@ |
651 |
+ endif() |
652 |
+ endif() |
653 |
+ |
654 |
+-# default to searching for application bundles first |
655 |
++# default to searching for application bundles last |
656 |
+ if(NOT DEFINED CMAKE_FIND_APPBUNDLE) |
657 |
+- set(CMAKE_FIND_APPBUNDLE FIRST) |
658 |
++ set(CMAKE_FIND_APPBUNDLE LAST) |
659 |
+ endif() |
660 |
+ # set up the default search directories for application bundles |
661 |
+ set(_apps_paths) |
662 |
+ foreach(_path |
663 |
++ @GENTOO_PORTAGE_EPREFIX@Applications |
664 |
++ @GENTOO_PORTAGE_EPREFIX@usr/bin |
665 |
+ "~/Applications" |
666 |
+ "/Applications" |
667 |
+ "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+ |
668 |
+--- a/Modules/Platform/UnixPaths.cmake |
669 |
++++ b/Modules/Platform/UnixPaths.cmake |
670 |
+@@ -33,6 +33,7 @@ |
671 |
+ # search types. |
672 |
+ list(APPEND CMAKE_SYSTEM_PREFIX_PATH |
673 |
+ # Standard |
674 |
++ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@ |
675 |
+ /usr/local /usr / |
676 |
+ |
677 |
+ # CMake install location |
678 |
+@@ -44,43 +45,41 @@ |
679 |
+ |
680 |
+ # List common include file locations not under the common prefixes. |
681 |
+ list(APPEND CMAKE_SYSTEM_INCLUDE_PATH |
682 |
+- # Windows API on Cygwin |
683 |
+- /usr/include/w32api |
684 |
+- |
685 |
+- # X11 |
686 |
+- /usr/X11R6/include /usr/include/X11 |
687 |
+- |
688 |
+- # Other |
689 |
+- /usr/pkg/include |
690 |
+- /opt/csw/include /opt/include |
691 |
+- /usr/openwin/include |
692 |
++ @GENTOO_PORTAGE_EPREFIX@usr/include |
693 |
+ ) |
694 |
+ |
695 |
+ list(APPEND CMAKE_SYSTEM_LIBRARY_PATH |
696 |
+- # Windows API on Cygwin |
697 |
+- /usr/lib/w32api |
698 |
+- |
699 |
+- # X11 |
700 |
+- /usr/X11R6/lib /usr/lib/X11 |
701 |
+- |
702 |
+- # Other |
703 |
+- /usr/pkg/lib |
704 |
+- /opt/csw/lib /opt/lib |
705 |
+- /usr/openwin/lib |
706 |
++ @GENTOO_PORTAGE_GCCLIBDIR@/gcc |
707 |
++ @GENTOO_PORTAGE_GCCLIBDIR@ |
708 |
++ @GENTOO_PORTAGE_EPREFIX@usr/lib64 |
709 |
++ @GENTOO_PORTAGE_EPREFIX@usr/libx32 |
710 |
++ @GENTOO_PORTAGE_EPREFIX@usr/lib32 |
711 |
++ @GENTOO_PORTAGE_EPREFIX@usr/lib |
712 |
++ @GENTOO_PORTAGE_EPREFIX@lib |
713 |
+ ) |
714 |
+ |
715 |
+ list(APPEND CMAKE_SYSTEM_PROGRAM_PATH |
716 |
+- /usr/pkg/bin |
717 |
++ @GENTOO_PORTAGE_EPREFIX@usr/bin |
718 |
++ @GENTOO_PORTAGE_EPREFIX@bin |
719 |
+ ) |
720 |
+ |
721 |
+ list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES |
722 |
+- /lib /usr/lib /usr/lib32 /usr/lib64 |
723 |
++ @GENTOO_PORTAGE_GCCLIBDIR@/gcc |
724 |
++ @GENTOO_PORTAGE_GCCLIBDIR@ |
725 |
++ @GENTOO_PORTAGE_EPREFIX@usr/lib64 |
726 |
++ @GENTOO_PORTAGE_EPREFIX@usr/libx32 |
727 |
++ @GENTOO_PORTAGE_EPREFIX@usr/lib32 |
728 |
++ @GENTOO_PORTAGE_EPREFIX@usr/lib |
729 |
++ @GENTOO_PORTAGE_EPREFIX@lib |
730 |
++ /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32 |
731 |
+ ) |
732 |
+ |
733 |
+ list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES |
734 |
++ @GENTOO_PORTAGE_EPREFIX@usr/include |
735 |
+ /usr/include |
736 |
+ ) |
737 |
+ list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES |
738 |
++ @GENTOO_PORTAGE_EPREFIX@usr/include |
739 |
+ /usr/include |
740 |
+ ) |
741 |
+ |
742 |
|
743 |
diff --git a/dev-util/cmake/files/cmake-2.8.11.2-hppa-bootstrap.patch b/dev-util/cmake/files/cmake-2.8.11.2-hppa-bootstrap.patch |
744 |
new file mode 100644 |
745 |
index 0000000..9928e14 |
746 |
--- /dev/null |
747 |
+++ b/dev-util/cmake/files/cmake-2.8.11.2-hppa-bootstrap.patch |
748 |
@@ -0,0 +1,20 @@ |
749 |
+--- a/CompileFlags.cmake |
750 |
++++ b/CompileFlags.cmake |
751 |
+@@ -66,5 +66,5 @@ |
752 |
+ # avoid binutils problem with large binaries, e.g. when building CMake in debug mode |
753 |
+ # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230 |
754 |
+ if (CMAKE_SYSTEM_NAME STREQUAL Linux AND CMAKE_SYSTEM_PROCESSOR STREQUAL parisc) |
755 |
+- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text.*") |
756 |
++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text._*") |
757 |
+ endif () |
758 |
+--- a/bootstrap |
759 |
++++ b/bootstrap |
760 |
+@@ -691,7 +691,7 @@ |
761 |
+ # avoid binutils problem with large binaries, e.g. when building CMake in debug mode |
762 |
+ # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230 |
763 |
+ if ${cmake_machine_parisc}; then |
764 |
+- cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text.*" |
765 |
++ cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text._*" |
766 |
+ fi |
767 |
+ fi |
768 |
+ |
769 |
|
770 |
diff --git a/dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch b/dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch |
771 |
new file mode 100644 |
772 |
index 0000000..6dc244c |
773 |
--- /dev/null |
774 |
+++ b/dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch |
775 |
@@ -0,0 +1,43 @@ |
776 |
+From: Julian Ospald <hasufell@g.o> |
777 |
+Date: Sun Dec 8 13:38:06 UTC 2013 |
778 |
+Subject: fix check for freetype-2.5.1 |
779 |
+ |
780 |
+--- Modules/FindFreetype.cmake |
781 |
++++ Modules/FindFreetype.cmake |
782 |
+@@ -64,6 +64,19 @@ |
783 |
+ PATH_SUFFIXES include/freetype2 include |
784 |
+ ) |
785 |
+ |
786 |
++if(NOT FREETYPE_INCLUDE_DIR_freetype2) |
787 |
++ find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h |
788 |
++ HINTS |
789 |
++ ENV FREETYPE_DIR |
790 |
++ PATHS |
791 |
++ /usr/X11R6 |
792 |
++ /usr/local/X11R6 |
793 |
++ /usr/local/X11 |
794 |
++ /usr/freeware |
795 |
++ PATH_SUFFIXES include/freetype2 include |
796 |
++ ) |
797 |
++endif() |
798 |
++ |
799 |
+ find_library(FREETYPE_LIBRARY |
800 |
+ NAMES freetype libfreetype freetype219 |
801 |
+ HINTS |
802 |
+@@ -82,8 +95,14 @@ |
803 |
+ endif() |
804 |
+ set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}") |
805 |
+ |
806 |
+-if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") |
807 |
+- file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str |
808 |
++if(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") |
809 |
++ set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") |
810 |
++elseif(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h") |
811 |
++ set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h") |
812 |
++endif() |
813 |
++ |
814 |
++if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H) |
815 |
++ file(STRINGS "${FREETYPE_H}" freetype_version_str |
816 |
+ REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$") |
817 |
+ |
818 |
+ unset(FREETYPE_VERSION_STRING) |
819 |
|
820 |
diff --git a/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch b/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch |
821 |
new file mode 100644 |
822 |
index 0000000..b094f17 |
823 |
--- /dev/null |
824 |
+++ b/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch |
825 |
@@ -0,0 +1,23 @@ |
826 |
+--- Modules/FindImageMagick.cmake |
827 |
++++ Modules/FindImageMagick.cmake |
828 |
+@@ -147,17 +147,17 @@ |
829 |
+ ) |
830 |
+ if(component STREQUAL "Magick++") |
831 |
+ FIND_IMAGEMAGICK_API(Magick++ Magick++.h |
832 |
+- Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-Q8HDRI |
833 |
++ Magick++ CORE_RL_Magick++_ Magick++-6.Q64 Magick++-6.Q64HDRI Magick++-6.Q32 Magick++-6.Q32HDRI Magick++-6.Q16 Magick++-6.Q16HDRI Magick++-6.Q8 Magick++-6.Q8HDRI |
834 |
+ ) |
835 |
+ list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY) |
836 |
+ elseif(component STREQUAL "MagickWand") |
837 |
+ FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h |
838 |
+- Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8 MagickWand-6.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-Q8HDRI |
839 |
++ Wand MagickWand CORE_RL_wand_ MagickWand-6.Q64 MagickWand-6.Q64HDRI MagickWand-6.Q32 MagickWand-6.Q32HDRI MagickWand-6.Q16 MagickWand-6.Q16HDRI MagickWand-6.Q8 MagickWand-6.Q8HDRI |
840 |
+ ) |
841 |
+ list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY) |
842 |
+ elseif(component STREQUAL "MagickCore") |
843 |
+ FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h |
844 |
+- Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8 MagickCore-6.Q16HDRI MagickCore-Q16HDRI MagickCore-6.Q8HDRI MagickCore-Q8HDRI |
845 |
++ Magick MagickCore CORE_RL_magick_ MagickCore-6.Q64 MagickCore-6.Q64HDRI MagickCore-6.Q32 MagickCore-6.Q32HDRI MagickCore-6.Q16 MagickCore-6.Q16HDRI MagickCore-6.Q8 MagickCore-6.Q8HDRI |
846 |
+ ) |
847 |
+ list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY) |
848 |
+ else() |
849 |
|
850 |
diff --git a/dev-util/cmake/files/cmake-2.8.12.2-FindBoost-python.patch b/dev-util/cmake/files/cmake-2.8.12.2-FindBoost-python.patch |
851 |
new file mode 100644 |
852 |
index 0000000..4a5474a |
853 |
--- /dev/null |
854 |
+++ b/dev-util/cmake/files/cmake-2.8.12.2-FindBoost-python.patch |
855 |
@@ -0,0 +1,77 @@ |
856 |
+--- Modules/FindBoost.cmake |
857 |
++++ Modules/FindBoost.cmake |
858 |
+@@ -905,6 +905,15 @@ |
859 |
+ |
860 |
+ set( _boost_docstring_release "Boost ${COMPONENT} library (release)") |
861 |
+ set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)") |
862 |
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") |
863 |
++ # Get version of Python. |
864 |
++ if (NOT PYTHON_EXECUTABLE) |
865 |
++ #if a certain version of python was detected by cmake before use that one |
866 |
++ set(PYTHON_EXECUTABLE "python") |
867 |
++ endif (NOT PYTHON_EXECUTABLE) |
868 |
++ execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version) |
869 |
++ endif() |
870 |
++ |
871 |
+ |
872 |
+ # |
873 |
+ # Find RELEASE libraries |
874 |
+@@ -915,6 +924,14 @@ |
875 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} |
876 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} |
877 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT} ) |
878 |
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") |
879 |
++ list(APPEND _boost_RELEASE_NAMES |
880 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} |
881 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} |
882 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} |
883 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} |
884 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} ) |
885 |
++ endif() |
886 |
+ if(_boost_STATIC_RUNTIME_WORKAROUND) |
887 |
+ set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}") |
888 |
+ list(APPEND _boost_RELEASE_NAMES |
889 |
+@@ -922,6 +939,13 @@ |
890 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} |
891 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} |
892 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) |
893 |
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") |
894 |
++ list(APPEND _boost_RELEASE_NAMES |
895 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} |
896 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} |
897 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} |
898 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) |
899 |
++ endif() |
900 |
+ endif() |
901 |
+ if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") |
902 |
+ _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES}) |
903 |
+@@ -951,6 +975,15 @@ |
904 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} |
905 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED} |
906 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT} ) |
907 |
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") |
908 |
++ list(APPEND _boost_DEBUG_NAMES |
909 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} |
910 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} |
911 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} |
912 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} |
913 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED} |
914 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} ) |
915 |
++ endif() |
916 |
+ if(_boost_STATIC_RUNTIME_WORKAROUND) |
917 |
+ set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}") |
918 |
+ list(APPEND _boost_DEBUG_NAMES |
919 |
+@@ -958,6 +991,13 @@ |
920 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} |
921 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} |
922 |
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) |
923 |
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") |
924 |
++ list(APPEND _boost_DEBUG_NAMES |
925 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} |
926 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} |
927 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} |
928 |
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) |
929 |
++ endif() |
930 |
+ endif() |
931 |
+ if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") |
932 |
+ _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES}) |
933 |
|
934 |
diff --git a/dev-util/cmake/files/cmake-2.8.12.2-hppa-bootstrap.patch b/dev-util/cmake/files/cmake-2.8.12.2-hppa-bootstrap.patch |
935 |
new file mode 100644 |
936 |
index 0000000..99e39a2 |
937 |
--- /dev/null |
938 |
+++ b/dev-util/cmake/files/cmake-2.8.12.2-hppa-bootstrap.patch |
939 |
@@ -0,0 +1,27 @@ |
940 |
+diff --git a/CompileFlags.cmake b/CompileFlags.cmake |
941 |
+index 20f5dec..24ac58d 100644 |
942 |
+--- a/CompileFlags.cmake |
943 |
++++ b/CompileFlags.cmake |
944 |
+@@ -66,5 +66,5 @@ endif () |
945 |
+ # avoid binutils problem with large binaries, e.g. when building CMake in debug mode |
946 |
+ # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230 |
947 |
+ if (CMAKE_SYSTEM_NAME STREQUAL Linux AND CMAKE_SYSTEM_PROCESSOR STREQUAL parisc) |
948 |
+- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text.*") |
949 |
++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text._*") |
950 |
+ endif () |
951 |
+diff --git a/bootstrap b/bootstrap |
952 |
+index 9784d5d..51d067e 100755 |
953 |
+--- a/bootstrap |
954 |
++++ b/bootstrap |
955 |
+@@ -692,10 +692,7 @@ if ${cmake_system_linux}; then |
956 |
+ # avoid binutils problem with large binaries, e.g. when building CMake in debug mode |
957 |
+ # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230 |
958 |
+ if ${cmake_machine_parisc}; then |
959 |
+- # if -O[s23] is given the effect is inverted, so do not use the flag then |
960 |
+- if [ "`echo "${CXXFLAGS}" | sed -r '/^(.* )?(-O[s234])( .*)?$/s/.*/-Os/'`" != "-Os" ]; then |
961 |
+- cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text.*" |
962 |
+- fi |
963 |
++ cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text._*" |
964 |
+ fi |
965 |
+ fi |
966 |
+ |
967 |
|
968 |
diff --git a/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch b/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch |
969 |
new file mode 100644 |
970 |
index 0000000..6808b80 |
971 |
--- /dev/null |
972 |
+++ b/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch |
973 |
@@ -0,0 +1,44 @@ |
974 |
+diff -ruN cmake-2.8.7.orig/Modules/FindLAPACK.cmake cmake-2.8.7/Modules/FindLAPACK.cmake |
975 |
+--- cmake-2.8.7.orig/Modules/FindLAPACK.cmake 2011-12-30 17:49:56.000000000 +0100 |
976 |
++++ cmake-2.8.7/Modules/FindLAPACK.cmake 2012-03-09 02:15:46.000000000 +0100 |
977 |
+@@ -1,3 +1,9 @@ |
978 |
++# |
979 |
++# Version modified for Gentoo Linux |
980 |
++# If a valid PkgConfig configuration is found, this overrides and cancels |
981 |
++# all further checks. |
982 |
++# |
983 |
++ |
984 |
+ # - Find LAPACK library |
985 |
+ # This module finds an installed fortran library that implements the LAPACK |
986 |
+ # linear-algebra interface (see http://www.netlib.org/lapack/). |
987 |
+@@ -36,6 +42,24 @@ |
988 |
+ # (To distribute this file outside of CMake, substitute the full |
989 |
+ # License text for the above reference.) |
990 |
+ |
991 |
++# |
992 |
++# first, try PkgConfig |
993 |
++# |
994 |
++find_package(PkgConfig REQUIRED) |
995 |
++pkg_check_modules(PC_LAPACK lapack) |
996 |
++if(PC_LAPACK_FOUND) |
997 |
++ foreach(PC_LIB ${PC_LAPACK_LIBRARIES}) |
998 |
++ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} ) |
999 |
++ if (NOT ${PC_LIB}_LIBRARY) |
1000 |
++ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}") |
1001 |
++ endif (NOT ${PC_LIB}_LIBRARY) |
1002 |
++ list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY}) |
1003 |
++ endforeach(PC_LIB) |
1004 |
++ find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES) |
1005 |
++ mark_as_advanced(LAPACK_LIBRARIES) |
1006 |
++else(PC_LAPACK_FOUND) |
1007 |
++message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.") |
1008 |
++ |
1009 |
+ set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) |
1010 |
+ |
1011 |
+ get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES) |
1012 |
+@@ -305,3 +329,5 @@ |
1013 |
+ endif(BLA_F95) |
1014 |
+ |
1015 |
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) |
1016 |
++ |
1017 |
++endif(PC_LAPACK_FOUND) |
1018 |
|
1019 |
diff --git a/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch b/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch |
1020 |
new file mode 100644 |
1021 |
index 0000000..c5e17c5 |
1022 |
--- /dev/null |
1023 |
+++ b/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch |
1024 |
@@ -0,0 +1,18 @@ |
1025 |
+diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake |
1026 |
+index c47f583..5783d37 100644 |
1027 |
+--- a/Modules/FindPkgConfig.cmake |
1028 |
++++ b/Modules/FindPkgConfig.cmake |
1029 |
+@@ -87,7 +87,12 @@ |
1030 |
+ set(PKG_CONFIG_VERSION 1) |
1031 |
+ set(PKG_CONFIG_FOUND 0) |
1032 |
+ |
1033 |
+-find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") |
1034 |
++if(NOT PKG_CONFIG_EXECUTABLE) |
1035 |
++ set(PKG_CONFIG_EXECUTABLE $ENV{PKG_CONFIG}) |
1036 |
++ if(NOT PKG_CONFIG_EXECUTABLE) |
1037 |
++ find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") |
1038 |
++ endif(NOT PKG_CONFIG_EXECUTABLE) |
1039 |
++endif(NOT PKG_CONFIG_EXECUTABLE) |
1040 |
+ mark_as_advanced(PKG_CONFIG_EXECUTABLE) |
1041 |
+ |
1042 |
+ if(PKG_CONFIG_EXECUTABLE) |
1043 |
|
1044 |
diff --git a/dev-util/cmake/files/cmake.vim b/dev-util/cmake/files/cmake.vim |
1045 |
new file mode 100644 |
1046 |
index 0000000..5cecd7d |
1047 |
--- /dev/null |
1048 |
+++ b/dev-util/cmake/files/cmake.vim |
1049 |
@@ -0,0 +1,3 @@ |
1050 |
+autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in runtime! indent/cmake.vim |
1051 |
+autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in setf cmake |
1052 |
+autocmd BufRead,BufNewFile *.ctest,*.ctest.in setf cmake |
1053 |
|
1054 |
diff --git a/dev-util/cmake/metadata.xml b/dev-util/cmake/metadata.xml |
1055 |
new file mode 100644 |
1056 |
index 0000000..a23f444 |
1057 |
--- /dev/null |
1058 |
+++ b/dev-util/cmake/metadata.xml |
1059 |
@@ -0,0 +1,5 @@ |
1060 |
+<?xml version="1.0" encoding="UTF-8"?> |
1061 |
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
1062 |
+<pkgmetadata> |
1063 |
+ <herd>kde</herd> |
1064 |
+</pkgmetadata> |