summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDebarshi Ray <rishi@gnu.org>2020-03-12 18:11:47 +0100
committerDebarshi Ray <rishi@gnu.org>2020-03-12 18:13:49 +0100
commit52adcdb89a9eb527df38c569539d95c1c7aeda6e (patch)
tree0c2bc874883adf62a164a6fa4071391d5c4da23e
parent88e512ca7197a45c4114f7fa993108f23245bf50 (diff)
downloadgstreamer-common-master.tar.gz
build: Adapt to backwards incompatible change in GNU Make 4.3HEADmaster
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/gstreamer/common/-/merge_requests/4
-rw-r--r--gst-glib-gen.mak3
1 files changed, 2 insertions, 1 deletions
diff --git a/gst-glib-gen.mak b/gst-glib-gen.mak
index 76b2233..bcb4240 100644
--- a/gst-glib-gen.mak
+++ b/gst-glib-gen.mak
@@ -8,7 +8,8 @@
#glib_gen_decl_banner=GST_EXPORT
#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-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)-marshal.h: $(glib_gen_basename)-marshal.list