package/libgpg-error: fix build issue following 1.42 bump

The build failed with gazillions of:

"gpg-error.h:1211:2: error: stray '\' in program"

This is already fixed by upstream commit
33593864cd54143db594c4237bba41e14179061c, which we backport. It is
backported as patch 0001, and the existing 0001 renamed to 0002, as it
appears later in the libgpg-error Git history.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Thomas Petazzoni 2021-07-03 23:47:29 +02:00
parent 3d86f7f141
commit fab6a64b52
2 changed files with 36 additions and 2 deletions

View File

@ -0,0 +1,34 @@
From 7350874f6f62314af4c8ec1973c91d305a6f4ddc Mon Sep 17 00:00:00 2001
From: David Michael <fedora.dm0@gmail.com>
Date: Fri, 26 Mar 2021 16:06:50 +0900
Subject: [PATCH] build: Fix generation of lock-obj-pub.native.h for cross
build.
* src/gen-lock-obj.sh: Capture echo output with quotes.
--
Fixes-commit: 99ae862a96a569724f49a604ebb7d3f6d2c2d374
Signed-off-by: David Michael <fedora.dm0@gmail.com>
Upstream: 33593864cd54143db594c4237bba41e14179061c
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
src/gen-lock-obj.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gen-lock-obj.sh b/src/gen-lock-obj.sh
index a710f0c..258eec6 100755
--- a/src/gen-lock-obj.sh
+++ b/src/gen-lock-obj.sh
@@ -38,7 +38,7 @@
# AWK=gawk ./gen-lock-obj.sh
#
-if test -n `echo -n`; then
+if test -n "`echo -n`"; then
ECHO_C='\c'
ECHO_N=''
else
--
2.31.1

View File

@ -1,4 +1,4 @@
From 220a427b4f997ef6af1b2d4e82ef1dc96e0cd6ff Mon Sep 17 00:00:00 2001
From 7ede0d4ce19e0ed14cd1cec81ba7df4e467f1eeb Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Mon, 21 Jun 2021 12:16:20 +0900
Subject: [PATCH] build: Fix --disable-threads.
@ -35,5 +35,5 @@ index 258eec6..014667f 100755
## Local Variables:
## mode: c
--
2.11.0
2.31.1