[arch-commits] Commit in aegisub/trunk (PKGBUILD make-4.3.patch)

[Evangelos Foutras]

    Date: Wednesday, April 29, 2020 @ 14:32:25
  Author: foutrelis
Revision: 622263

Fix build with make 4.3

Added:
  aegisub/trunk/make-4.3.patch
Modified:
  aegisub/trunk/PKGBUILD

----------------+
 PKGBUILD       |    3 +++
 make-4.3.patch |   23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-29 14:23:02 UTC (rev 622262)
+++ PKGBUILD	2020-04-29 14:32:25 UTC (rev 622263)
@@ -36,11 +36,13 @@
   git+https://github.com/Aegisub/Aegisub.git#tag=v${pkgver}
   boost-1.68.patch
   icu59.patch
+  make-4.3.patch
 )
 sha256sums=(
   SKIP
   aa1689a2204f6a617000f3380b8dea9c3dca4f500d0643e05172750c49cc5a21
   29d8cc91e73602d5e3c8517c977dcc77cb84af7d42787f510d487d0a6abf7fa6
+  1e350a04c152075b369176f8e0b7f691a792de0d5091568e2388e6bd677180e1
 )
 
 prepare() {
@@ -51,6 +53,7 @@
   sed 's/$(LIBS_BOOST) $(LIBS_ICU)/$(LIBS_BOOST) $(LIBS_ICU) -pthread/' -i tools/Makefile # missing link flag
   sed 's/^Exec=/Exec=env GDK_BACKEND=x11 /' -i packages/desktop/aegisub.desktop.template.in # fix running under wayland
   patch -Np1 -i ../icu59.patch
+  patch -Np1 -i ../make-4.3.patch
 
   ./autogen.sh
 }

Added: make-4.3.patch
===================================================================
--- make-4.3.patch	                        (rev 0)
+++ make-4.3.patch	2020-04-29 14:32:25 UTC (rev 622263)
@@ -0,0 +1,23 @@
+From f4cc905c69ca69c68cb95674cefce4abc37ce046 Mon Sep 17 00:00:00 2001
+From: wangqr <wangqr at wangqr.tk>
+Date: Mon, 17 Feb 2020 14:42:07 +0800
+Subject: [PATCH] Use target name without directory in $*_OBJ macro
+
+Fix Aegisub/Aegisub#171
+---
+ Makefile.target | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.target b/Makefile.target
+index 516ef3c24..5c4c5d259 100644
+--- a/Makefile.target
++++ b/Makefile.target
+@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $<
+ # Libraries contain all object files they depend on (but they may depend on other files)
+ # Not using libtool on OS X because it has an unsilenceable warning about a
+ # compatibility issue with BSD 4.3 (wtf)
+-lib%.a: $$($$*_OBJ)
++lib%.a: $$($$(*F)_OBJ)
+ 	@$(BIN_MKDIR_P) $(dir $@)
+ 	$(BIN_AR) cru $@ $(filter %.o,$^)
+ 	$(BIN_RANLIB) $@