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