[aegisub] Fix FTBFS

commit 54873c67397ae9751005c98938882eafcf059d76 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Tue Jun 9 18:57:37 2020 +0100 Fix FTBFS aegisub-fix_build_with_make4.3.patch | 23 +++++++++++++++++++++++ aegisub.spec | 2 ++ 2 files changed, 25 insertions(+) --- diff --git a/aegisub-fix_build_with_make4.3.patch b/aegisub-fix_build_with_make4.3.patch new file mode 100644 index 0000000..6edb8c3 --- /dev/null +++ b/aegisub-fix_build_with_make4.3.patch @@ -0,0 +1,23 @@ +From f4cc905c69ca69c68cb95674cefce4abc37ce046 Mon Sep 17 00:00:00 2001 +From: wangqr <wangqr(a)wangqr.tk&gt; +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) $@ diff --git a/aegisub.spec b/aegisub.spec index 3831515..1069963 100644 --- a/aegisub.spec +++ b/aegisub.spec @@ -27,6 +27,8 @@ Patch5: aegisub-git-version.patch Patch6: aegisub-DataBlockCache-Fix-crash-in-cache-invalidation.patch #PATCH-FIX-UPSTREAM - davejplater(a)gmail.com - aegisub-boost169.patch - Fixes build with boost 1.69 where boost/gil/gil_all.hpp is moved to -boost169.patch Patch7: aegisub-boost169.patch +# https://github.com/wangqr/Aegisub/commit/f4cc905c69ca69c68cb95674cefce4ab... +Patch8: aegisub-fix_build_with_make4.3.patch # luajit isn't available on powerpc # boost m4 detection is failing on i686 and armv7hl