From: Karel Zak <kzak@redhat.com>
Date: Thu, 14 Oct 2021 10:17:31 +0000 (+0200)
Subject: build-sys: patch libtool.m4 for darwin
X-Git-Tag: v2.38-rc1~225
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=06953d22470bd5733fe1045d7f8f39ba715b5c6f;p=thirdparty%2Futil-linux.git

build-sys: patch libtool.m4 for darwin

Fixes: https://github.com/karelzak/util-linux/issues/1468
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/autogen.sh b/autogen.sh
index 4d03c3b422..9b6cfd390b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -126,12 +126,24 @@ if ! grep -q datarootdir po/Makefile.in.in; then
 datadir = @datadir@/g' po/Makefile.in.in
 fi
 $LIBTOOLIZE --force $LT_OPTS
+
+# patch libtool
+if test -f tools/libtool.m4.patch; then
+	if test -L m4/libtool.m4; then
+		cp m4/libtool.m4 m4/libtool.m4.org
+		rm m4/libtool.m4
+		mv m4/libtool.m4.org m4/libtool.m4
+	fi
+	patch -p1 --batch < tools/libtool.m4.patch
+fi
+
 aclocal -I m4 $AL_OPTS
 autoconf $AC_OPTS
 autoheader $AH_OPTS
 
 automake --add-missing $AM_OPTS
 
+
 cd "$THEDIR"
 
 echo
diff --git a/tools/libtool.m4.patch b/tools/libtool.m4.patch
new file mode 100755
index 0000000000..bd8becda68
--- /dev/null
+++ b/tools/libtool.m4.patch
@@ -0,0 +1,24 @@
+--- a/m4/libtool.m4	2021-10-14 11:55:26.305333399 +0200
++++ b/m4/libtool.m4	2021-10-14 12:01:45.487505638 +0200
+@@ -1067,16 +1067,11 @@
+       _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]][[,.]]*)
+-	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+-	10.*)
++    darwin*)
++      case ${MACOSX_DEPLOYMENT_TARGET},$host in
++       10.[[012]],*|,*powerpc*)
++          _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
++       *)
+ 	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+       esac
+     ;;