blob: ebab82382e074a11e94f5eb3cbb3e37177dcf30d (
plain)
1 From 54987d445ea714b467d901b7daf8c09ed0644189 Mon Sep 17 00:00:00 2001
2 From: Debarshi Ray <debarshir@freedesktop.org>
3 Date: Thu, 12 Mar 2020 14:07:23 +0100
4 Subject: [PATCH] build: Adapt to backwards incompatible change in GNU Make 4.3
5
6 GNU Make 4.3 has a backwards incompatible change affecting the use of
7 number signs or hashes (ie., #) inside function invocations. See:
8 https://lists.gnu.org/archive/html/info-gnu/2020-01/msg00004.html
9
10 In this case, it would expand the '\#' in the '\n\#include \"$(h)\"'
11 argument to the foreach call to '\#', not '#'. This would lead to
12 spurious backslashes in front of the '#include' directives in the
13 generated fs-enumtypes.c file.
14
15 Spotted by Ernestas Kulik.
16
17 https://gitlab.freedesktop.org/farstream/farstream/-/merge_requests/4
18 ---
19 common-modified/gst-glib-gen.mak | 3 ++-
20 1 file changed, 2 insertions(+), 1 deletion(-)
21
22 diff --git a/common-modified/gst-glib-gen.mak b/common-modified/gst-glib-gen.mak
23 index 14f1ba37..2247a41c 100644
24 --- a/common-modified/gst-glib-gen.mak
25 +++ b/common-modified/gst-glib-gen.mak
26 @@ -6,7 +6,8 @@
27 #glib_gen_prefix=gst_color_balance
28 #glib_gen_basename=colorbalance
29
30 -enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
31 +hash:=\#
32 +enum_headers=$(foreach h,$(glib_enum_headers),\n$(hash)include \"$(h)\")
33
34 # these are all the rules generating the relevant files
35 $(glib_gen_basename)-enumtypes.h: $(glib_enum_headers)
36 --
37 2.24.1
|
