diff options
| author | Jack Nagel | 2013-11-06 18:37:10 -0600 |
|---|---|---|
| committer | Jack Nagel | 2013-11-06 18:37:10 -0600 |
| commit | e1c635e69e6b996b70d5010634e573d9be35ebd2 (patch) | |
| tree | 37dc9a54fed2c260b773edc79d0545514cb0b3c0 /Library/Formula/libtool.rb | |
| parent | 90eb8ea70b3516ed12ed285e52f076615153cd5f (diff) | |
| download | homebrew-e1c635e69e6b996b70d5010634e573d9be35ebd2.tar.bz2 | |
libtool: add upstream patch to allow -stdlib= flag
Diffstat (limited to 'Library/Formula/libtool.rb')
| -rw-r--r-- | Library/Formula/libtool.rb | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/Library/Formula/libtool.rb b/Library/Formula/libtool.rb index f010ecdaf..7da7ad5fe 100644 --- a/Library/Formula/libtool.rb +++ b/Library/Formula/libtool.rb @@ -10,10 +10,10 @@ class Libtool < Formula sha1 '22b71a8b5ce3ad86e1094e7285981cae10e6ff88' bottle do - revision 1 - sha1 '3a025da1e80c2965f0eee2591fca225315f97290' => :mavericks - sha1 'bd62a22ee51cceec5e359d33f6b19d217368166d' => :mountain_lion - sha1 '0cf484aa89183c6b3228c0f156229c787f996f89' => :lion + revision 2 + sha1 '860a75329b31aa8729d71438d6a696fd453a85e4' => :mavericks + sha1 'd97af1451dd547b5857bddfa8e5f241fd78d7c9d' => :mountain_lion + sha1 '6873a7b72e86f369f43125c0e29ae5cdbc2d67c1' => :lion end if MacOS::Xcode.provides_autotools? or File.file? "/usr/bin/glibtoolize" @@ -22,6 +22,11 @@ class Libtool < Formula option :universal + # 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 + def patches; DATA; end + def install ENV.universal_binary if build.universal? system "./configure", "--disable-dependency-tracking", @@ -41,3 +46,21 @@ class Libtool < Formula system "#{bin}/glibtool", 'execute', '/usr/bin/true' end end + +__END__ +diff --git a/libltdl/config/ltmain.sh b/libltdl/config/ltmain.sh +index 63ae69d..9ae038c 100644 +--- a/libltdl/config/ltmain.sh ++++ b/libltdl/config/ltmain.sh +@@ -5851,9 +5851,10 @@ func_mode_link () + # -tp=* Portland pgcc target processor selection + # --sysroot=* for sysroot support + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization ++ # -stdlib=* select c++ std lib with clang + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ +- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) ++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-stdlib=*) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" |