| 1 |
commit: 72555480840ef0b506dceb74b92c7405fb225faf |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Apr 25 17:03:44 2018 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Apr 25 17:03:44 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72555480 |
| 7 |
|
| 8 |
dev-util/cmake: fix compilation on Darwin, bug #652134 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/652134 |
| 11 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 12 |
|
| 13 |
dev-util/cmake/cmake-3.11.0.ebuild | 9 ++++++++- |
| 14 |
dev-util/cmake/cmake-3.11.1.ebuild | 9 ++++++++- |
| 15 |
2 files changed, 16 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-util/cmake/cmake-3.11.0.ebuild b/dev-util/cmake/cmake-3.11.0.ebuild |
| 18 |
index 2ceccc1ef95..6bab5d7c8c2 100644 |
| 19 |
--- a/dev-util/cmake/cmake-3.11.0.ebuild |
| 20 |
+++ b/dev-util/cmake/cmake-3.11.0.ebuild |
| 21 |
@@ -80,7 +80,8 @@ cmake_src_bootstrap() { |
| 22 |
|
| 23 |
# execinfo.h on Solaris isn't quite what it is on Darwin |
| 24 |
if [[ ${CHOST} == *-solaris* ]] ; then |
| 25 |
- sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die |
| 26 |
+ sed -i -e 's/execinfo\.h/blablabla.h/' \ |
| 27 |
+ Source/kwsys/CMakeLists.txt || die |
| 28 |
fi |
| 29 |
|
| 30 |
tc-export CC CXX LD |
| 31 |
@@ -123,6 +124,12 @@ cmake_src_test() { |
| 32 |
src_prepare() { |
| 33 |
cmake-utils_src_prepare |
| 34 |
|
| 35 |
+ # disable Xcode hooks, bug #652134 |
| 36 |
+ if [[ ${CHOST} == *-darwin* ]] ; then |
| 37 |
+ sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \ |
| 38 |
+ Source/cmGlobalXCodeGenerator.cxx || die |
| 39 |
+ fi |
| 40 |
+ |
| 41 |
# Add gcc libs to the default link paths |
| 42 |
sed -i \ |
| 43 |
-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ |
| 44 |
|
| 45 |
diff --git a/dev-util/cmake/cmake-3.11.1.ebuild b/dev-util/cmake/cmake-3.11.1.ebuild |
| 46 |
index 2ceccc1ef95..6bab5d7c8c2 100644 |
| 47 |
--- a/dev-util/cmake/cmake-3.11.1.ebuild |
| 48 |
+++ b/dev-util/cmake/cmake-3.11.1.ebuild |
| 49 |
@@ -80,7 +80,8 @@ cmake_src_bootstrap() { |
| 50 |
|
| 51 |
# execinfo.h on Solaris isn't quite what it is on Darwin |
| 52 |
if [[ ${CHOST} == *-solaris* ]] ; then |
| 53 |
- sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die |
| 54 |
+ sed -i -e 's/execinfo\.h/blablabla.h/' \ |
| 55 |
+ Source/kwsys/CMakeLists.txt || die |
| 56 |
fi |
| 57 |
|
| 58 |
tc-export CC CXX LD |
| 59 |
@@ -123,6 +124,12 @@ cmake_src_test() { |
| 60 |
src_prepare() { |
| 61 |
cmake-utils_src_prepare |
| 62 |
|
| 63 |
+ # disable Xcode hooks, bug #652134 |
| 64 |
+ if [[ ${CHOST} == *-darwin* ]] ; then |
| 65 |
+ sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \ |
| 66 |
+ Source/cmGlobalXCodeGenerator.cxx || die |
| 67 |
+ fi |
| 68 |
+ |
| 69 |
# Add gcc libs to the default link paths |
| 70 |
sed -i \ |
| 71 |
-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ |
Archives