unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
blob 20a84f6e59d66b99077921716eef0f973a470a28 1423 bytes (raw)
name: gnu/packages/patches/farstream-make.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
 
From 54987d445ea714b467d901b7daf8c09ed0644189 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@freedesktop.org>
Date: Thu, 12 Mar 2020 14:07:23 +0100
Subject: [PATCH] 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
---
 common-modified/gst-glib-gen.mak | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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)
-- 
GitLab


debug log:

solving 20a84f6e59 ...
found 20a84f6e59 in https://yhetil.org/guix-patches/c9679efa-2900-a808-9f06-aa0a9ec55cb0@disroot.org/ ||
	https://yhetil.org/guix-patches/94e3509a94987e01381487915b561556@disroot.org/ ||
	https://yhetil.org/guix-patches/b433dab7171fa30cf46c2a296ed60d3f@disroot.org/ ||
	https://yhetil.org/guix-patches/077b9a0aae6651fd26b187a0e53fd791@disroot.org/

applying [1/1] https://yhetil.org/guix-patches/c9679efa-2900-a808-9f06-aa0a9ec55cb0@disroot.org/
diff --git a/gnu/packages/patches/farstream-make.patch b/gnu/packages/patches/farstream-make.patch
new file mode 100644
index 0000000000..20a84f6e59

1:35: trailing whitespace.
 
1:39: trailing whitespace.
 
1:42: trailing whitespace.
-- 
Checking patch gnu/packages/patches/farstream-make.patch...
1:44: new blank line at EOF.
+
Applied patch gnu/packages/patches/farstream-make.patch cleanly.
warning: 4 lines add whitespace errors.

skipping https://yhetil.org/guix-patches/94e3509a94987e01381487915b561556@disroot.org/ for 20a84f6e59
skipping https://yhetil.org/guix-patches/b433dab7171fa30cf46c2a296ed60d3f@disroot.org/ for 20a84f6e59
skipping https://yhetil.org/guix-patches/077b9a0aae6651fd26b187a0e53fd791@disroot.org/ for 20a84f6e59
index at:
100644 20a84f6e59d66b99077921716eef0f973a470a28	gnu/packages/patches/farstream-make.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).