e6def5f827
Too many bugs.
Squashed commit of the following:
commit f86f5885384c7c19c3db9140e3afc0b327072b9e
Author: Jack Nagel <jacknagel@gmail.com>
Date: Wed Nov 5 00:44:54 2014 -0600
Revert "libtool 2.4.3"
This reverts commit 6ba215f498c82ebca11f30f3d3fd948a62dfe862.
commit 9c0ca0becd8c09852197df4fa5ea879a0c271f90
Author: Jack Nagel <jacknagel@gmail.com>
Date: Wed Nov 5 00:44:49 2014 -0600
Revert "libtool: add upstream patch to fix parallel build"
This reverts commit 5f181c9d1ab094aa75c8e6e6a2caaec402483426.
commit 2a2823175ee546176f36eea286c1cba49f1d2246
Author: Jack Nagel <jacknagel@gmail.com>
Date: Wed Nov 5 00:44:41 2014 -0600
Revert "libtool: update 2.4.3 bottle."
This reverts commit 4f50210751864ecb7adc8e483026346fb9dbbf66.
commit d13d9e965673881689171b2d4933f36f728108fc
Author: Jack Nagel <jacknagel@gmail.com>
Date: Wed Nov 5 00:44:35 2014 -0600
Revert "libtool: fix universal build"
This reverts commit 0f80370be66ddcfcea7c9d2ea20dd331f32e3eb1.
109 lines
4 KiB
Ruby
109 lines
4 KiB
Ruby
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"
|
|
|
|
bottle do
|
|
cellar :any
|
|
revision 3
|
|
sha1 "e172450c5686c7f7e13237c927cb49cce4c0ac0c" => :yosemite
|
|
sha1 "bbf17c08138fb53a4512732a2dab4f5c8dbec364" => :mavericks
|
|
sha1 "c749e65dee61cd23b7e757a1308761d8396689e4" => :mountain_lion
|
|
sha1 "d709c921f42e1f299b5bf09314eb73ab0dfa716d" => :lion
|
|
end
|
|
|
|
keg_only :provided_until_xcode43
|
|
|
|
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
|
|
|
|
# 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
|
|
ENV.universal_binary if build.universal?
|
|
system "./configure", "--disable-dependency-tracking",
|
|
"--prefix=#{prefix}",
|
|
"--program-prefix=g",
|
|
"--enable-ltdl-install"
|
|
system "make install"
|
|
end
|
|
|
|
def caveats; <<-EOS.undent
|
|
In order to prevent conflicts with Apple's own libtool we have prepended a "g"
|
|
so, you have instead: glibtool and glibtoolize.
|
|
EOS
|
|
end
|
|
|
|
test do
|
|
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"
|
|
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' ;;
|