summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-networking/recipes-support/nbdkit/nbdkit/0001-server-Fix-build-when-printf-is-a-macro.patch39
1 files changed, 0 insertions, 39 deletions
diff --git a/meta-networking/recipes-support/nbdkit/nbdkit/0001-server-Fix-build-when-printf-is-a-macro.patch b/meta-networking/recipes-support/nbdkit/nbdkit/0001-server-Fix-build-when-printf-is-a-macro.patch
deleted file mode 100644
index c7ec41eb9a..0000000000
--- a/meta-networking/recipes-support/nbdkit/nbdkit/0001-server-Fix-build-when-printf-is-a-macro.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 28f07715ab4d670ce81e12776bbece043305bd83 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 11 Apr 2020 15:08:39 -0700
4Subject: [PATCH] server: Fix build when printf is a macro
5
6clang complains on x86 when building
7
8main.c:116:2: error: embedding a #include directive within macro arguments is not supported
9 ^
10
11convert nesting include into a string assignment, to same effect but
12making it compatible with clang as well
13
14Upstream-Status: Submitted [https://github.com/libguestfs/nbdkit/pull/3]
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16---
17 server/main.c | 5 +++--
18 1 file changed, 3 insertions(+), 2 deletions(-)
19
20diff --git a/server/main.c b/server/main.c
21index 748122f..c0ac874 100644
22--- a/server/main.c
23+++ b/server/main.c
24@@ -112,9 +112,10 @@ static void
25 usage (void)
26 {
27 /* --{short,long}-options remain undocumented */
28- printf (
29+ char const *opt_list =
30 #include "synopsis.c"
31- );
32+ ;
33+ printf ("%s\n", opt_list);
34 printf ("\n"
35 "Please read the nbdkit(1) manual page for full usage.\n");
36 }
37--
382.26.0
39