afterstep: fix build with binutils>=2.36

2022-10-08 14:28:49 +02:00 · 2022-10-08 14:28:49 +02:00 · 967022f938
parent f5314dea61
commit 967022f938
1 changed files with 97 additions and 0 deletions
--- a/srcpkgs/afterstep/patches/fix-binutils-2.36+.patch
+++ b/srcpkgs/afterstep/patches/fix-binutils-2.36+.patch
@ -0,0 +1,97 @@
+From 5e9e897cf8c455390dd6f5b27fec49707f6b9088 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sat, 20 Nov 2021 10:07:02 +0000
+Subject: [PATCH] Makefile.in: drop 'l' from 'ar' (binutils-2.36+ support)
+
+Before the change build failed as:
+
+    $ make
+    ...
+    ar clq libAfterBase.a ashash.o aslist.o asvector.o audit.o fs.o layout.o mystring.o os.o output.o parse.o regexp.o safemalloc.o selfdiag.o sleep.o socket.o timer.o trace.o xml.o xprop.o xwrap.o
+    ar: libdeps specified more than once
+
+It used to work until binutils-2.36 because 'l' option was silently
+ignored on binutils-2.35. On 2.36 'l' became 'libdeps' flag with
+required option:
+
+   https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=f3016d6ce178b76002edde12c30ebe7f608a8e21
+
+Applied change as:
+
+    $ sed -i 's/ar clq/ar cq/g' */*.in */*/*.in
+
+Closes: https://github.com/afterstep/afterstep/issues/2
+Closes: https://github.com/afterstep/afterstep/issues/3
+---
+ autoconf/Makefile.defines.in        | 2 +-
+ libAfterBase/Makefile.in            | 2 +-
+ libAfterImage/Makefile.in           | 2 +-
+ libAfterImage/aftershow/Makefile.in | 2 +-
+ libAfterImage/apps/Makefile.in      | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/autoconf/Makefile.defines.in b/autoconf/Makefile.defines.in
+index 63e781663..3e1b7ae38 100644
+--- a/autoconf/Makefile.defines.in
+++ b/autoconf/Makefile.defines.in
+@@ -9,7 +9,7 @@ CCFLAGS         = @CFLAGS@
+ EXTRA_DEFINES	= 
+ 
+ RANLIB		= @RANLIB@
+-AR		= ar clq
+AR		= ar cq
+ CP		= @CP@
+ MV		= @MV@
+ RM		= @RM@
+diff --git a/libAfterBase/Makefile.in b/libAfterBase/Makefile.in
+index e5e91c231..0fb505d47 100644
+--- a/libAfterBase/Makefile.in
+++ b/libAfterBase/Makefile.in
+@@ -58,7 +58,7 @@ CCFLAGS         = @CFLAGS@
+ EXTRA_DEFINES	= @DEFINE_XLOCALE@
+ 
+ RANLIB		= @RANLIB@
+-AR		= ar clq
+AR		= ar cq
+ CP		= @CP@
+ MV		= @MV@
+ RM		= @RM@
+diff --git a/libAfterImage/Makefile.in b/libAfterImage/Makefile.in
+index 124b0df88..bb5251776 100644
+--- a/libAfterImage/Makefile.in
+++ b/libAfterImage/Makefile.in
+@@ -76,7 +76,7 @@ CCFLAGS         = @CFLAGS@  @MMX_CFLAGS@
+ EXTRA_DEFINES	= @DEFINE_XLOCALE@
+ 
+ RANLIB		= @RANLIB@
+-AR		= ar clq
+AR		= ar cq
+ CP		= @CP@
+ MV		= @MV@
+ RM		= @RM@
+diff --git a/libAfterImage/aftershow/Makefile.in b/libAfterImage/aftershow/Makefile.in
+index b7592923f..7acdcd2eb 100644
+--- a/libAfterImage/aftershow/Makefile.in
+++ b/libAfterImage/aftershow/Makefile.in
+@@ -11,7 +11,7 @@ CCFLAGS         = @CFLAGS@
+ EXTRA_DEFINES	= @DEFINE_XLOCALE@
+ 
+ RANLIB		= @RANLIB@
+-AR		= ar clq
+AR		= ar cq
+ CP		= @CP@
+ MV		= @MV@
+ RM		= @RM@
+diff --git a/libAfterImage/apps/Makefile.in b/libAfterImage/apps/Makefile.in
+index 47a64bd5e..ed7cd5afc 100644
+--- a/libAfterImage/apps/Makefile.in
+++ b/libAfterImage/apps/Makefile.in
+@@ -8,7 +8,7 @@ CCFLAGS         = @CFLAGS@
+ EXTRA_DEFINES	= @DEFINE_XLOCALE@
+ 
+ RANLIB		= @RANLIB@
+-AR		= ar clq
+AR		= ar cq
+ CP		= @CP@
+ MV		= @MV@
+ RM		= @RM@