summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDebarshi Ray <debarshir@freedesktop.org>2020-03-12 14:07:23 +0100
committerDebarshi Ray <debarshir@freedesktop.org>2020-03-12 14:19:48 +0100
commit54987d445ea714b467d901b7daf8c09ed0644189 (patch)
treeaa2e5bd3f79f0dcbb7f477dcf580b70fe990dac3
parentfe9da146fd74de6cf82e43efad1f8675428f39ca (diff)
downloadfarstream-54987d445ea714b467d901b7daf8c09ed0644189.tar.gz
build: Adapt to backwards incompatible change in GNU Make 4.3
GNU Make 4.3 has a backwards incompatible change affecting the use of number signs or hashes (ie., #) inside function invocations. See: https://lists.gnu.org/archive/html/info-gnu/2020-01/msg00004.html In this case, it would expand the '\#' in the '\n\#include \"$(h)\"' argument to the foreach call to '\#', not '#'. This would lead to spurious backslashes in front of the '#include' directives in the generated fs-enumtypes.c file. Spotted by Ernestas Kulik. https://gitlab.freedesktop.org/farstream/farstream/-/merge_requests/4
-rw-r--r--common-modified/gst-glib-gen.mak3
1 files changed, 2 insertions, 1 deletions
diff --git a/common-modified/gst-glib-gen.mak b/common-modified/gst-glib-gen.mak
index 14f1ba37..2247a41c 100644
--- a/common-modified/gst-glib-gen.mak
+++ b/common-modified/gst-glib-gen.mak
@@ -6,7 +6,8 @@
#glib_gen_prefix=gst_color_balance
#glib_gen_basename=colorbalance
-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
+hash:=\#
+enum_headers=$(foreach h,$(glib_enum_headers),\n$(hash)include \"$(h)\")
# these are all the rules generating the relevant files
$(glib_gen_basename)-enumtypes.h: $(glib_enum_headers)