libtool: 2.4.6 -> 2.4.7
libtool2-macos11.patch has been merged upstream as 9e8c88251 Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
parent
a459707011
commit
dfb616bf5e
|
@ -1,32 +0,0 @@
|
|||
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
|
||||
---
|
||||
m4/libtool.m4 | 13 ++++---------
|
||||
1 file changed, 4 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/m4/libtool.m4 b/m4/libtool.m4
|
||||
index f2d1f398..b971e8e7 100644
|
||||
--- a/m4/libtool.m4
|
||||
+++ b/m4/libtool.m4
|
||||
@@ -1067,16 +1067,11 @@ _LT_EOF
|
||||
_lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
|
||||
darwin1.*)
|
||||
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
|
||||
- darwin*) # darwin 5.x on
|
||||
- # if running on 10.5 or later, the deployment target defaults
|
||||
- # to the OS version, if on x86, and 10.4, the deployment
|
||||
- # target defaults to 10.4. Don't you love it?
|
||||
- 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]][[,.]]*)
|
||||
+ darwin*)
|
||||
+ case ${MACOSX_DEPLOYMENT_TARGET},$host in
|
||||
+ 10.[[012]],*|,*powerpc*)
|
||||
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
|
||||
- 10.*)
|
||||
+ *)
|
||||
_lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
|
||||
esac
|
||||
;;
|
||||
--
|
||||
2.24.3 (Apple Git-128)
|
|
@ -1,4 +1,6 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, autoconf, automake, m4, perl, help2man
|
||||
, runtimeShell
|
||||
, file
|
||||
}:
|
||||
|
||||
# Note: this package is used for bootstrapping fetchurl, and thus
|
||||
|
@ -8,20 +10,18 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libtool";
|
||||
version = "2.4.6";
|
||||
version = "2.4.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/libtool/${pname}-${version}.tar.gz";
|
||||
sha256 = "1qq61k6lp1fp75xs398yzi6wvbx232l7xbyn3p13cnh27mflvgg3";
|
||||
sha256 = "sha256-BOlsJATqcMWQxUbrpCAqThJyLGQAFsErmy8c49SB6ag=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "lib" ];
|
||||
|
||||
patches = [
|
||||
# Suport macOS version 11.0
|
||||
# https://lists.gnu.org/archive/html/libtool-patches/2020-06/msg00001.html
|
||||
./libtool2-macos11.patch
|
||||
];
|
||||
# FILECMD was added in libtool 2.4.7; previous versions hardwired `/usr/bin/file`
|
||||
# https://lists.gnu.org/archive/html/autotools-announce/2022-03/msg00000.html
|
||||
FILECMD = "${file}/bin/file";
|
||||
|
||||
# Normally we'd use autoreconfHook, but that includes libtoolize.
|
||||
postPatch = ''
|
||||
|
@ -34,10 +34,18 @@ stdenv.mkDerivation rec {
|
|||
automake
|
||||
autoconf
|
||||
popd
|
||||
'' +
|
||||
# libtool commit da2e352735722917bf0786284411262195a6a3f6 changed
|
||||
# the shebang from `/bin/sh` (which is a special sandbox exception)
|
||||
# to `/usr/bin/env sh`, meaning that we now need to patch shebangs
|
||||
# in libtoolize and ltmain.sh since `dontPatchShebangs` is set:
|
||||
''
|
||||
substituteInPlace libtoolize.in --replace '#! /usr/bin/env sh' '#!${runtimeShell}'
|
||||
substituteInPlace build-aux/ltmain.in --replace '#! /usr/bin/env sh' '#!${runtimeShell}'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ perl help2man m4 ] ++ [ autoconf automake ];
|
||||
propagatedBuildInputs = [ m4 ];
|
||||
nativeBuildInputs = [ autoconf automake help2man m4 perl ];
|
||||
propagatedBuildInputs = [ m4 file ];
|
||||
|
||||
# Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
|
||||
# "fixed" path in generated files!
|
||||
|
|
Loading…
Reference in a new issue