[gtk-osx] Fix libtool's archive extraction on macOS 12.



commit 0ea065095f592cadf78f3e2fadf3eb4416904395
Author: John Ralls <jralls ceridwen us>
Date:   Mon Nov 8 15:11:51 2021 -0800

    Fix libtool's archive extraction on macOS 12.
    
    Apple's sort -uc igores the -u so do that in the first sort.

 modulesets-stable/bootstrap.modules |  4 +++-
 patches/libtool-apple-sort.patch    | 12 ++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/modulesets-stable/bootstrap.modules b/modulesets-stable/bootstrap.modules
index deb46126..0aea8260 100644
--- a/modulesets-stable/bootstrap.modules
+++ b/modulesets-stable/bootstrap.modules
@@ -74,7 +74,9 @@
   <autotools id="libtool" autogen-sh="configure" bootstrap="true">
     <branch repo="ftp.gnu.org"
             module="libtool/libtool-2.4.6.tar.gz" version="2.4.6"
-            hash="sha256:e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3"/>
+            hash="sha256:e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3">
+      <patch file="libtool-apple-sort.patch" strip="1"/>
+    </branch>
   </autotools>
 
 
diff --git a/patches/libtool-apple-sort.patch b/patches/libtool-apple-sort.patch
new file mode 100644
index 00000000..76acfe28
--- /dev/null
+++ b/patches/libtool-apple-sort.patch
@@ -0,0 +1,12 @@
+--- a/build-aux/ltmain.in      2015-02-06 04:57:56.000000000 -0800
++++ b/build-aux/ltmain.in      2021-11-08 14:58:33.000000000 -0800
+@@ -3188,7 +3188,7 @@
+     if test yes = "$lock_old_archive_extraction"; then
+       $opt_dry_run || rm -f "$lockfile"
+     fi
+-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
++    if ($AR t "$f_ex_an_ar_oldlib" | sort -u | sort -c >/dev/null 2>&1); then
+      :
+     else
+       func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
+


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]