fix build with make 4.3 (from debian)

diff --git a/aegisub.spec b/aegisub.spec
index 3e7ea35faaa9a0fa897acd9811847f1d1a17a20e..211a7f46f03741cc3825030c62bf720c4021d785 100644 (file)
--- a/aegisub.spec
+++ b/aegisub.spec
@@ -1,5 +1,4 @@
 # TODO
-# - make 4.3 breaks build
 # - unvendor vendor/luabins
 # - unvendor vendor/luajit
 # - unvendor vendor/universalchardet
@@ -22,6 +21,7 @@ Patch1:               %{name}-icu.patch
 Patch2:                %{name}-icu64.patch
 Patch3:                %{name}-boost-1.70.patch
 Patch4:                cflags.patch
+Patch5:                make-4.3.patch
 URL:           http://www.aegisub.org/
 # AC_AGI_COMPILE tries to run test program which tries to open device and most likely fails
 #BuildRequires:        OpenAL-devel >= 0.0.8
@@ -93,6 +93,7 @@ obsługa tych zaawansowanych funkcji.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %{__mv} vendor{,.keep}
 mkdir vendor

diff --git a/make-4.3.patch b/make-4.3.patch
new file mode 100644 (file)
index 0000000..6edb8c3
--- /dev/null
+++ b/make-4.3.patch
@@ -0,0 +1,23 @@
+From f4cc905c69ca69c68cb95674cefce4abc37ce046 Mon Sep 17 00:00:00 2001
+From: wangqr <wangqr@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) $@