wbrawner/homebrew-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libtool: fix interpretation of MACOSX_DEPLOYMENT_TARGET on 10.10

Browse source
This commit is contained in:
Jack Nagel 2014-10-15 21:17:25 -05:00
parent 64c333c53f
commit f59c1e3fc1
1 changed files with 49 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
Formula/libtool.rb
View file

@ -1,13 +1,13 @@
require 'formula'
require "formula"
# Xcode 4.3 provides the Apple libtool.
# This is not the same so as a result we must install this as glibtool.
class Libtool < Formula
homepage 'http://www.gnu.org/software/libtool/'
url 'http://ftpmirror.gnu.org/libtool/libtool-2.4.2.tar.gz'
mirror 'http://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz'
sha1 '22b71a8b5ce3ad86e1094e7285981cae10e6ff88'
homepage "http://www.gnu.org/software/libtool/"
url "http://ftpmirror.gnu.org/libtool/libtool-2.4.2.tar.gz"
mirror "http://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz"
sha1 "22b71a8b5ce3ad86e1094e7285981cae10e6ff88"
bottle do
revision 2
@ -23,6 +23,10 @@ class Libtool < Formula
# Allow -stdlib= to pass through to linker
# http://git.savannah.gnu.org/gitweb/?p=libtool.git;a=commitdiff;h=8f975a1368594126e37d85511f1f96164e466d93
# https://trac.macports.org/ticket/32982
# Fix interpretation of MACOSX_DEPLOYMENT_TARGET on 10.10
# http://article.gmane.org/gmane.comp.gnu.libtool.patches/11730
# https://trac.macports.org/changeset/125325
patch :DATA
def install
@ -41,7 +45,7 @@ class Libtool < Formula
end
test do
system "#{bin}/glibtool", 'execute', '/usr/bin/true'
system "#{bin}/glibtool", "execute", "/usr/bin/true"
end
end
@ -62,3 +66,42 @@ index 63ae69d..9ae038c 100644
func_quote_for_eval "$arg"
arg="$func_quote_for_eval_result"
func_append compile_command " $arg"
diff --git a/configure b/configure
index a1ef3e3..782d28a 100755
--- a/configure
+++ b/configure
@@ -7765,7 +7765,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
10.0,*86*-darwin8*|10.0,*-darwin[91]*)
_lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- 10.[012]*)
+ 10.[012][,.]*)
_lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
10.*)
_lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
diff --git a/libltdl/configure b/libltdl/configure
index f18f272..fef1137 100755
--- a/libltdl/configure
+++ b/libltdl/configure
@@ -6978,7 +6978,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
10.0,*86*-darwin8*|10.0,*-darwin[91]*)
_lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- 10.[012]*)
+ 10.[012][,.]*)
_lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
10.*)
_lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 44e0ecf..4adcf73 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -1052,7 +1052,7 @@ _LT_EOF
case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
_lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- 10.[[012]]*)
+ 10.[[012]][[,.]]*)
_lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
10.*)
_lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;