summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2012-06-17 15:31:44 +0000
committerFabian Groffen <grobian@gentoo.org>2012-06-17 15:31:44 +0000
commitff1471e999e77aac3e40d1fbbf30134d6a1ca3ee (patch)
treee86b05ce298a48630f4a03b97198bedcff7c366a /dev-util/cmake
parentRevision bump including several patches from upstream (including a fix for bu... (diff)
downloadgentoo-2-ff1471e999e77aac3e40d1fbbf30134d6a1ca3ee.tar.gz
gentoo-2-ff1471e999e77aac3e40d1fbbf30134d6a1ca3ee.tar.bz2
gentoo-2-ff1471e999e77aac3e40d1fbbf30134d6a1ca3ee.zip
Run bootstrap with CONFIG_SHELL or (Prefix) sh, since the script is not /bin/sh compatible
Diffstat (limited to 'dev-util/cmake')
-rw-r--r--dev-util/cmake/Manifest16
-rw-r--r--dev-util/cmake/cmake-2.8.8-r3.ebuild5
2 files changed, 4 insertions, 17 deletions
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 5e6a147ba638..ec4618a6e4d4 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX 50cmake-gentoo.el 244 RMD160 effb4416a5170ed7c99ea74084f2598e2482fdf0 SHA1 c34102f3343980275169144b40af6ec69a87d7fc SHA256 6010e6df84aa23050fcbc490ae2b22802ede0870ff2e96c43fe541e97e0d6c00
AUX cmake-2.6.3-darwin-bundle.patch 952 RMD160 157295c7080e3fa5a1414c6f7efba4877049c5e7 SHA1 595740c64fd64e93763d7b1f59d341f9f8117482 SHA256 5429d3d7ba0d2bf2528b4cbf2bd36d3c83a051c064faa9c308d9adfeee334bca
AUX cmake-2.6.3-fix_broken_lfs_on_aix.patch 1366 RMD160 38094f9f8516656cc30d6ead147bc1e2ae41f429 SHA1 5458b92849292d9e8ca3003654a94e339cb4a48c SHA256 e403b204b3f64e5fb01af631c0bb72f083c3994cb7af91dd54b92458bd08a439
@@ -33,18 +30,7 @@ DIST cmake-2.8.8.tar.gz 5691656 RMD160 db60999fd4d1b3e2e28368d45035a058ed7e7639
EBUILD cmake-2.8.6-r4.ebuild 4912 RMD160 7fe756b422a8ac4ccb9d8d79ff29513ccc51c23b SHA1 61daa882ac8098115515898f10c56c7ecdbb854f SHA256 9a4240c99fc284d50066c3c93b770f9a246bf80820e68b2413ace735e8fc602a
EBUILD cmake-2.8.7-r4.ebuild 4882 RMD160 bc30106ec2f12f2b1e666ae1ea9703bc38f99179 SHA1 33e8d40b9783f6912f3cecfe74fb82d74b982ab6 SHA256 78fc4f9582ffadcf02effbf05813d6431235df8f1f856874f6434927445ac558
EBUILD cmake-2.8.7-r5.ebuild 4886 RMD160 69040d09998dd03ef76beb4a4b720808e247ad3f SHA1 ad326b6b790fc2d6a401532cc8b53d957f16fea6 SHA256 28ad7e686225eda878c1a34c13cddaeaf582ff066848fc95e29af5b95c1aeb97
-EBUILD cmake-2.8.8-r2.ebuild 4861 RMD160 428264687960120696f4ee7c7310af125ccb4730 SHA1 353770df02ccc2b6dddf4e7af5341de913e90ae6 SHA256 cc1067cf9469080860d3bdec38fcbb9d1619488c16995e33de5049e0d9ec5d6d
+EBUILD cmake-2.8.8-r2.ebuild 4881 RMD160 11bf9343c486facffb7bdca87ba800a3f60f9f9b SHA1 ae3400643faaf7193a1157e56030bc5a2bb83466 SHA256 c11c242f7dbc04ee7826ffefb704ba490dd05bd826e0ed8c6fb4988b033e0837
EBUILD cmake-2.8.8-r3.ebuild 4863 RMD160 d9851ead9873ed23fef561d47b99ba4d0f89fd5a SHA1 2e4bea0439150d5cbbb4fd7ce1e6f4c93f2c237e SHA256 a40d79de086cf29498173f374dd78dae90d1ae66a492beacffe84d1bf204ff8e
MISC ChangeLog 32795 RMD160 7cc8f01fcf73b26bdb3496d19ca4745fb54c3941 SHA1 02a0165dd6a4bb3499943e5373355291e8c83776 SHA256 af2c3135c104559b260eed9dde299108e8a86040af1ae9185687b41bd9939d9b
MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBAgAGBQJP2btGAAoJEMbwO6tnXQ0scYkIAIKmQ9nzfXVFgGflidvX9X61
-g7+9JfCKIVxBh2MrrXwZq/vES74NiZXH1SCuXT40kJ3onoRQiKjlw+BitRPhM3wz
-rN2F92wh0lYcTHAM+YphFJ+gFZlRD6JO47RLB1C1OyiG/W3CTGEv7l+hd/ft5C7j
-rXl3/CNKXAYzP+2Z1T7G5Buze/y96TQL85sdvMEEY0a9uEt+SU3KxUN/ns4UO3OM
-cLq+WEr0fbC60/ZIzP8GFolGz6rJlh0/hFzWIWFQ5QWV4wdZ/JwV+tIzZ6Xr/Pvd
-v03dsgHMRm3ShqQST7H2ZNLQPbgVqeeTC4OhBbKOmg/m4xstu0MMPFdTRWptGXg=
-=2ZV2
------END PGP SIGNATURE-----
diff --git a/dev-util/cmake/cmake-2.8.8-r3.ebuild b/dev-util/cmake/cmake-2.8.8-r3.ebuild
index 6724aca8dd3b..cd298646feaf 100644
--- a/dev-util/cmake/cmake-2.8.8-r3.ebuild
+++ b/dev-util/cmake/cmake-2.8.8-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.8-r3.ebuild,v 1.1 2012/06/14 10:22:27 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.8-r3.ebuild,v 1.2 2012/06/17 15:31:44 grobian Exp $
EAPI=4
@@ -73,7 +73,8 @@ cmake_src_bootstrap() {
tc-export CC CXX LD
- ./bootstrap \
+ # bootstrap script isn't exactly /bin/sh compatible
+ ${CONFIG_SHELL:-sh} ./bootstrap \
--prefix="${T}/cmakestrap/" \
${par_arg} \
|| die "Bootstrap failed"