summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libgpg-error
diff options
context:
space:
mode:
authorzangrc <zangrc.fnst@cn.fujitsu.com>2020-08-27 21:16:24 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-27 21:41:57 +0100
commit194d0ecc9846c5aff6a3e4f87c5719275f4f8a00 (patch)
treeb1639ae252bedd33769268e194ed66209a470e10 /meta/recipes-support/libgpg-error
parentb2ad2a7a7d445aa3e37eed5e640ce2a865299104 (diff)
downloadpoky-194d0ecc9846c5aff6a3e4f87c5719275f4f8a00.tar.gz
libgpg-error:upgrade 1.38 -> 1.39
0003-build-Fix-cross-compiling-into-a-separate-build-dir.patch 0005-src-gen-lock-obj.sh-add-a-file.patch Removed since these are included in 1.39 (From OE-Core rev: 73cc232e0f85b6f65403ba259770d8f85ccfd63f) Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libgpg-error')
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error/0003-build-Fix-cross-compiling-into-a-separate-build-dir.patch43
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error/0005-src-gen-lock-obj.sh-add-a-file.patch134
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error_1.39.bb (renamed from meta/recipes-support/libgpg-error/libgpg-error_1.38.bb)4
3 files changed, 1 insertions, 180 deletions
diff --git a/meta/recipes-support/libgpg-error/libgpg-error/0003-build-Fix-cross-compiling-into-a-separate-build-dir.patch b/meta/recipes-support/libgpg-error/libgpg-error/0003-build-Fix-cross-compiling-into-a-separate-build-dir.patch
deleted file mode 100644
index 20610bee5d..0000000000
--- a/meta/recipes-support/libgpg-error/libgpg-error/0003-build-Fix-cross-compiling-into-a-separate-build-dir.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From 6efe006e99a7e739afbf7fe8937445c82630fc8f Mon Sep 17 00:00:00 2001
2From: David Michael <fedora.dm0@gmail.com>
3Date: Mon, 1 Jun 2020 10:24:53 -0400
4Subject: [PATCH] build: Fix cross-compiling into a separate build dir.
5
6* configure.ac: Create the src directory before writing into it.
7* src/Makefile.am (EXTRA_DIST): Add gen-lock-obj.sh.
8
9--
10
11Upstream-Status: Backport
12Signed-off-by: David Michael <fedora.dm0@gmail.com>
13Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
14---
15 configure.ac | 1 +
16 src/Makefile.am | 2 +-
17 2 files changed, 2 insertions(+), 1 deletion(-)
18
19diff --git a/configure.ac b/configure.ac
20index def8bba..8c0d845 100644
21--- a/configure.ac
22+++ b/configure.ac
23@@ -598,6 +598,7 @@ if test x$cross_compiling = xyes; then
24 case $host in
25 *-*-linux*)
26 lock_obj_h_generated=yes
27+ mkdir src
28 LOCK_ABI_VERSION=1 host=$host host_alias=$host_alias \
29 CC=$CC OBJDUMP=$host_alias-objdump \
30 ac_ext=$ac_ext ac_objext=$ac_objext \
31diff --git a/src/Makefile.am b/src/Makefile.am
32index 2fb83c0..d773877 100644
33--- a/src/Makefile.am
34+++ b/src/Makefile.am
35@@ -102,7 +102,7 @@ EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \
36 gpg-error.vers gpg-error.def.in \
37 versioninfo.rc.in gpg-error.w32-manifest.in \
38 gpg-error-config-test.sh gpg-error.pc.in \
39- $(lock_obj_pub)
40+ gen-lock-obj.sh $(lock_obj_pub)
41
42 BUILT_SOURCES = $(srcdir)/err-sources.h $(srcdir)/err-codes.h \
43 code-to-errno.h code-from-errno.h \
diff --git a/meta/recipes-support/libgpg-error/libgpg-error/0005-src-gen-lock-obj.sh-add-a-file.patch b/meta/recipes-support/libgpg-error/libgpg-error/0005-src-gen-lock-obj.sh-add-a-file.patch
deleted file mode 100644
index e6f6c09bac..0000000000
--- a/meta/recipes-support/libgpg-error/libgpg-error/0005-src-gen-lock-obj.sh-add-a-file.patch
+++ /dev/null
@@ -1,134 +0,0 @@
1From fcb414abb62223e66dba413d0ca86eab3ea5bbc3 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Sun, 21 Jun 2020 13:54:47 +0000
4Subject: [PATCH] src-gen-lock-obj.sh: add a file
5
6This is erroneously missing from the tarball; it will show
7up in the next release tarball, as upstream has fixed the
8packaging in master.
9
10Upstream-Status: Inappropriate
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12---
13 src/gen-lock-obj.sh | 112 ++++++++++++++++++++++++++++++++++++++++++++
14 1 file changed, 112 insertions(+)
15 create mode 100755 src/gen-lock-obj.sh
16
17diff --git a/src/gen-lock-obj.sh b/src/gen-lock-obj.sh
18new file mode 100755
19index 0000000..13858cf
20--- /dev/null
21+++ b/src/gen-lock-obj.sh
22@@ -0,0 +1,112 @@
23+#! /bin/sh
24+#
25+# gen-lock-obj.sh - Build tool to construct the lock object.
26+#
27+# Copyright (C) 2020 g10 Code GmbH
28+#
29+# This file is part of libgpg-error.
30+#
31+# libgpg-error is free software; you can redistribute it and/or
32+# modify it under the terms of the GNU Lesser General Public License
33+# as published by the Free Software Foundation; either version 2.1 of
34+# the License, or (at your option) any later version.
35+#
36+# libgpg-error is distributed in the hope that it will be useful, but
37+# WITHOUT ANY WARRANTY; without even the implied warranty of
38+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
39+# Lesser General Public License for more details.
40+#
41+# You should have received a copy of the GNU Lesser General Public
42+# License along with this program; if not, see <https://www.gnu.org/licenses/>.
43+#
44+
45+#
46+# Following variables should be defined to invoke this script
47+#
48+# CC
49+# OBJDUMP
50+# AWK
51+# ac_ext
52+# ac_object
53+# host
54+# LOCK_ABI_VERSION
55+#
56+# An example:
57+#
58+# LOCK_ABI_VERSION=1 host=x86_64-pc-linux-gnu host_alias=x86_64-linux-gnu \
59+# CC=$host_alias-gcc OBJDUMP=$host_alias-objdump ac_ext=c ac_objext=o \
60+# AWK=gawk ./gen-lock-obj.sh
61+#
62+
63+AWK_VERSION_OUTPUT=$($AWK 'BEGIN { print PROCINFO["version"] }')
64+if test -n "$AWK_VERSION_OUTPUT"; then
65+ # It's GNU awk, which supports PROCINFO.
66+ AWK_OPTION=--non-decimal-data
67+fi
68+
69+cat <<'EOF' >conftest.$ac_ext
70+#include <pthread.h>
71+pthread_mutex_t mtx = PTHREAD_MUTEX_INITIALIZER;
72+EOF
73+
74+if $CC -c conftest.$ac_ext; then :
75+ ac_mtx_size=$($OBJDUMP -j .bss -t conftest.$ac_objext \
76+ | $AWK $AWK_OPTION '
77+/mtx$/ { mtx_size = int("0x" $5) }
78+END { print mtx_size }')
79+else
80+ echo "Can't determine mutex size"
81+ exit 1
82+fi
83+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
84+
85+cat <<EOF
86+## lock-obj-pub.$host.h
87+## File created by gen-lock-obj.sh - DO NOT EDIT
88+## To be included by mkheader into gpg-error.h
89+
90+typedef struct
91+{
92+ long _vers;
93+ union {
94+ volatile char _priv[$ac_mtx_size];
95+ long _x_align;
96+ long *_xp_align;
97+ } u;
98+} gpgrt_lock_t;
99+
100+EOF
101+
102+# FIXME: Support different alignment conditions of:
103+#
104+# USE_16BYTE_ALIGNMENT
105+# USE_DOUBLE_FOR_ALIGNMENT
106+# USE_LONG_DOUBLE_FOR_ALIGNMENT
107+#
108+
109+echo -n "#define GPGRT_LOCK_INITIALIZER {$LOCK_ABI_VERSION,{{"
110+
111+i=0
112+while test "$i" -lt $ac_mtx_size; do
113+ if test "$i" -ne 0 -a "$(( $i % 8 ))" -eq 0; then
114+ echo ' \'
115+ echo -n " "
116+ fi
117+ echo -n '0'
118+ if test "$i" -lt $(($ac_mtx_size - 1)); then
119+ echo -n ','
120+ fi
121+ i=$(( i + 1 ))
122+done
123+
124+cat <<'EOF'
125+}}}
126+##
127+## Local Variables:
128+## mode: c
129+## buffer-read-only: t
130+## End:
131+##
132+EOF
133+
134+exit 0
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.38.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.39.bb
index 9a3ec9b5bd..f53056f5c9 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.38.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.39.bb
@@ -16,11 +16,9 @@ UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
16SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ 16SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
17 file://pkgconfig.patch \ 17 file://pkgconfig.patch \
18 file://0001-Do-not-fail-when-testing-config-scripts.patch \ 18 file://0001-Do-not-fail-when-testing-config-scripts.patch \
19 file://0003-build-Fix-cross-compiling-into-a-separate-build-dir.patch \
20 file://0005-src-gen-lock-obj.sh-add-a-file.patch \
21 " 19 "
22 20
23SRC_URI[sha256sum] = "d8988275aa69d7149f931c10442e9e34c0242674249e171592b430ff7b3afd02" 21SRC_URI[sha256sum] = "4a836edcae592094ef1c5a4834908f44986ab2b82e0824a0344b49df8cdb298f"
24 22
25BINCONFIG = "${bindir}/gpg-error-config" 23BINCONFIG = "${bindir}/gpg-error-config"
26 24