diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2018-04-25 19:03:44 +0200 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2018-04-25 19:03:44 +0200 |
| commit | 72555480840ef0b506dceb74b92c7405fb225faf (patch) | |
| tree | c4455695e8421fdee7a726282826af85ee69e4d7 /dev-util | |
| parent | media-sound/cantata: Drop 2.2.0-r1 (diff) | |
| download | gentoo-72555480840ef0b506dceb74b92c7405fb225faf.tar.gz gentoo-72555480840ef0b506dceb74b92c7405fb225faf.tar.bz2 gentoo-72555480840ef0b506dceb74b92c7405fb225faf.zip | |
dev-util/cmake: fix compilation on Darwin, bug #652134
Closes: https://bugs.gentoo.org/652134
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/cmake/cmake-3.11.0.ebuild | 9 | ||||
| -rw-r--r-- | dev-util/cmake/cmake-3.11.1.ebuild | 9 |
2 files changed, 16 insertions, 2 deletions
diff --git a/dev-util/cmake/cmake-3.11.0.ebuild b/dev-util/cmake/cmake-3.11.0.ebuild index 2ceccc1ef951..6bab5d7c8c20 100644 --- a/dev-util/cmake/cmake-3.11.0.ebuild +++ b/dev-util/cmake/cmake-3.11.0.ebuild @@ -80,7 +80,8 @@ cmake_src_bootstrap() { # execinfo.h on Solaris isn't quite what it is on Darwin if [[ ${CHOST} == *-solaris* ]] ; then - sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die + sed -i -e 's/execinfo\.h/blablabla.h/' \ + Source/kwsys/CMakeLists.txt || die fi tc-export CC CXX LD @@ -123,6 +124,12 @@ cmake_src_test() { src_prepare() { cmake-utils_src_prepare + # disable Xcode hooks, bug #652134 + if [[ ${CHOST} == *-darwin* ]] ; then + sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \ + Source/cmGlobalXCodeGenerator.cxx || die + fi + # Add gcc libs to the default link paths sed -i \ -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ diff --git a/dev-util/cmake/cmake-3.11.1.ebuild b/dev-util/cmake/cmake-3.11.1.ebuild index 2ceccc1ef951..6bab5d7c8c20 100644 --- a/dev-util/cmake/cmake-3.11.1.ebuild +++ b/dev-util/cmake/cmake-3.11.1.ebuild @@ -80,7 +80,8 @@ cmake_src_bootstrap() { # execinfo.h on Solaris isn't quite what it is on Darwin if [[ ${CHOST} == *-solaris* ]] ; then - sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die + sed -i -e 's/execinfo\.h/blablabla.h/' \ + Source/kwsys/CMakeLists.txt || die fi tc-export CC CXX LD @@ -123,6 +124,12 @@ cmake_src_test() { src_prepare() { cmake-utils_src_prepare + # disable Xcode hooks, bug #652134 + if [[ ${CHOST} == *-darwin* ]] ; then + sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \ + Source/cmGlobalXCodeGenerator.cxx || die + fi + # Add gcc libs to the default link paths sed -i \ -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ |