Skip to content

Commit 0e6de24

Browse files
committed
Merge pull request #740 from hashdist/gmp_mac_fix
GMP OS X 10.10 fix
2 parents 7aa2c01 + 417f279 commit 0e6de24

3 files changed

Lines changed: 56 additions & 16 deletions

File tree

pkgs/gmp.yaml

Lines changed: 0 additions & 16 deletions
This file was deleted.

pkgs/gmp/gmp.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
extends: [autotools_package]
2+
3+
dependencies:
4+
build: [m4]
5+
6+
sources:
7+
- key: tar.bz2:p6hjvacltrwqofsm65kca67ihdwocimu
8+
url: http://mirrors.kernel.org/gnu/gmp/gmp-6.0.0a.tar.bz2
9+
10+
build_stages:
11+
- name: rpath_patch
12+
before: configure
13+
files: [osx_10_10_fix.patch]
14+
handler: bash
15+
bash: |
16+
patch -up1 < _hashdist/osx_10_10_fix.patch
17+
- name: configure
18+
extra: ['--enable-cxx']
19+
20+
when_build_dependency:
21+
- set: GMPXX_DIR
22+
value: '${ARTIFACT}'

pkgs/gmp/osx_10_10_fix.patch

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
commit 4519b66df0c8a175270c2caf4338c44159e594cb
2+
Author: Ondřej Čertík <ondrej.certik@gmail.com>
3+
Date: Fri May 1 00:08:15 2015 -0600
4+
5+
Make configure scripts detect OS X 10.10 properly
6+
7+
Previously it treated 10.10 as 10.1.
8+
9+
diff --git a/aclocal.m4 b/aclocal.m4
10+
index 11222f5..37c1162 100644
11+
--- a/aclocal.m4
12+
+++ b/aclocal.m4
13+
@@ -1066,7 +1066,7 @@ _LT_EOF
14+
case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
15+
10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
16+
_lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
17+
- 10.[[012]]*)
18+
+ 10.[[012]][[,.]]*)
19+
_lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
20+
10.*)
21+
_lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
22+
diff --git a/configure b/configure
23+
index 60c6bd5..b223c18 100755
24+
--- a/configure
25+
+++ b/configure
26+
@@ -14809,7 +14809,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
27+
case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
28+
10.0,*86*-darwin8*|10.0,*-darwin[91]*)
29+
_lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
30+
- 10.[012]*)
31+
+ 10.[012][,.]*)
32+
_lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
33+
10.*)
34+
_lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;

0 commit comments

Comments
 (0)