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