| 1 |
commit: 96ed1a37d7fc76b5e970158d31ce5692dbf58a12 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 2 18:58:46 2020 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 2 18:58:54 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96ed1a37 |
| 7 |
|
| 8 |
dev-util/cmake-3.19.1: fix compilation on Darwin |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/757426 |
| 11 |
Package-Manager: Portage-3.0.9, Repoman-3.0.2 |
| 12 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-util/cmake/cmake-3.19.1.ebuild | 8 +++++++- |
| 15 |
1 file changed, 7 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/dev-util/cmake/cmake-3.19.1.ebuild b/dev-util/cmake/cmake-3.19.1.ebuild |
| 18 |
index 9c290413b18..54a6d646dda 100644 |
| 19 |
--- a/dev-util/cmake/cmake-3.19.1.ebuild |
| 20 |
+++ b/dev-util/cmake/cmake-3.19.1.ebuild |
| 21 |
@@ -129,14 +129,20 @@ cmake_src_test() { |
| 22 |
src_prepare() { |
| 23 |
cmake_src_prepare |
| 24 |
|
| 25 |
- # disable Xcode hooks, bug #652134 |
| 26 |
if [[ ${CHOST} == *-darwin* ]] ; then |
| 27 |
+ # disable Xcode hooks, bug #652134 |
| 28 |
sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \ |
| 29 |
Source/cmGlobalXCodeGenerator.cxx || die |
| 30 |
# disable isysroot usage with GCC, we've properly instructed |
| 31 |
# where things are via GCC configuration and ldwrapper |
| 32 |
sed -i -e '/cmake_gnu_set_sysroot_flag/d' \ |
| 33 |
Modules/Platform/Apple-GNU-*.cmake || die |
| 34 |
+ # don't set a POSIX standard, system headers don't like that, #757426 |
| 35 |
+ sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \ |
| 36 |
+ Source/cmLoadCommandCommand.cxx \ |
| 37 |
+ Source/cmStandardLexer.h \ |
| 38 |
+ Source/cmSystemTools.cxx \ |
| 39 |
+ Source/cmTimestamp.cxx |
| 40 |
fi |
| 41 |
|
| 42 |
# Add gcc libs to the default link paths |
Archives