From 8b4de154127fdb95874d4d632431bbbabb3cbf64 Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Sat, 25 Jul 2020 01:43:19 +0000 Subject: [PATCH] Fix build with make 4.2 --- debian/changelog | 3 +++ debian/rules | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0c2b9d6..bc311f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ x264 (2:0.159.2999+git296494a-2+rpi1) bullseye-staging; urgency=medium * Pass --disable-asm for static build to prevent it being armv7/neon contaminated. + [Changes introduced in 2:0.159.2999+git296494a-2+rpi1 by Peter Michael Green] + * Fix build with make 4.2 + -- Raspbian forward porter Thu, 23 Jul 2020 20:26:51 +0000 x264 (2:0.159.2999+git296494a-2) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index 101f300..7bb019e 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,10 @@ #!/usr/bin/make -f -libx264N := libx264-$(shell awk '/#define X264_BUILD/{print $$3}' x264.h) +# GNU make 4.3 changes the escaping rules for the hash sign, the reccomended +# way to maintain compatibility with both 4.2 and 4.3 is to use a variable +# see https://lwn.net/Articles/810071/ +HASHDEFINE:=\#define +libx264N := libx264-$(shell awk '/$(HASHDEFINE) X264_BUILD/{print $$3}' x264.h) include /usr/share/dpkg/architecture.mk include debian/confflags -- 2.30.2