From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 71D531382C5 for ; Wed, 25 Apr 2018 17:04:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97973E0999; Wed, 25 Apr 2018 17:04:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7268FE0999 for ; Wed, 25 Apr 2018 17:04:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4BE5C335C30 for ; Wed, 25 Apr 2018 17:03:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AE4E9287 for ; Wed, 25 Apr 2018 17:03:57 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1524675824.72555480840ef0b506dceb74b92c7405fb225faf.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/cmake/cmake-3.11.0.ebuild dev-util/cmake/cmake-3.11.1.ebuild X-VCS-Directories: dev-util/cmake/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 72555480840ef0b506dceb74b92c7405fb225faf X-VCS-Branch: master Date: Wed, 25 Apr 2018 17:03:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f6ca2897-d407-4152-861a-1f365a14a2fd X-Archives-Hash: 9ad0fe3cc94405a63e5da4bc5ef43628 commit: 72555480840ef0b506dceb74b92c7405fb225faf Author: Fabian Groffen gentoo org> AuthorDate: Wed Apr 25 17:03:44 2018 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Wed Apr 25 17:03:44 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72555480 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 dev-util/cmake/cmake-3.11.0.ebuild | 9 ++++++++- 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 2ceccc1ef95..6bab5d7c8c2 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 2ceccc1ef95..6bab5d7c8c2 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" \