diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-05-24 11:13:39 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-25 22:36:09 +0100 |
commit | 8c18e3c0620a57b5f1841f4592889e52a4853e3c (patch) | |
tree | 6356830c59bf0513687b3cb1803ac78a58168f17 /meta/recipes-support/libgpg-error | |
parent | 2267eebd65515281f02648dfd9ca7b6c15a813ce (diff) | |
download | poky-8c18e3c0620a57b5f1841f4592889e52a4853e3c.tar.gz |
libgpg-error: update 1.41 -> 1.42
(From OE-Core rev: 9d08ba366260a161c34b81ad6d9e52fe970e83d3)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.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/0001-configure.ac-do-not-hardcode-gnu-libc-when-generatin.patch | 27 | ||||
-rw-r--r-- | meta/recipes-support/libgpg-error/libgpg-error/fix-cross.patch | 28 | ||||
-rw-r--r-- | meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch | 129 | ||||
-rw-r--r-- | meta/recipes-support/libgpg-error/libgpg-error_1.42.bb (renamed from meta/recipes-support/libgpg-error/libgpg-error_1.41.bb) | 4 |
4 files changed, 130 insertions, 58 deletions
diff --git a/meta/recipes-support/libgpg-error/libgpg-error/0001-configure.ac-do-not-hardcode-gnu-libc-when-generatin.patch b/meta/recipes-support/libgpg-error/libgpg-error/0001-configure.ac-do-not-hardcode-gnu-libc-when-generatin.patch new file mode 100644 index 0000000000..0f6e309391 --- /dev/null +++ b/meta/recipes-support/libgpg-error/libgpg-error/0001-configure.ac-do-not-hardcode-gnu-libc-when-generatin.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From 7437acb228678ea5d8288b930b4f5b72c3d449ed Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Mon, 24 May 2021 11:03:42 +0200 | ||
4 | Subject: [PATCH] configure.ac: do not hardcode gnu libc when generating | ||
5 | lock-obj | ||
6 | |||
7 | This erroneously excluded e.g. musl libc. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
11 | --- | ||
12 | configure.ac | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/configure.ac b/configure.ac | ||
16 | index c0aab53..6d46d13 100644 | ||
17 | --- a/configure.ac | ||
18 | +++ b/configure.ac | ||
19 | @@ -603,7 +603,7 @@ if test x"$gl_use_threads" = xno; then | ||
20 | AC_MSG_NOTICE([generated src/lock-obj-pub.native.h for $host]) | ||
21 | elif test x$cross_compiling = xyes; then | ||
22 | case $host in | ||
23 | - *-*-linux-gnu*) | ||
24 | + *-*-linux-*) | ||
25 | AC_CHECK_TOOL(OBJDUMP, [objdump]) | ||
26 | if test -n "$OBJDUMP"; then | ||
27 | lock_obj_h_generated=yes | ||
diff --git a/meta/recipes-support/libgpg-error/libgpg-error/fix-cross.patch b/meta/recipes-support/libgpg-error/libgpg-error/fix-cross.patch new file mode 100644 index 0000000000..ae424cdb9a --- /dev/null +++ b/meta/recipes-support/libgpg-error/libgpg-error/fix-cross.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From: David Michael <fedora.dm0@gmail.com> | ||
2 | Date: Fri, 26 Mar 2021 07:06:50 +0000 (+0900) | ||
3 | Subject: build: Fix generation of lock-obj-pub.native.h for cross build. | ||
4 | X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commitdiff_plain;h=33593864cd54143db594c4237bba41e14179061c | ||
5 | |||
6 | build: Fix generation of lock-obj-pub.native.h for cross build. | ||
7 | |||
8 | * src/gen-lock-obj.sh: Capture echo output with quotes. | ||
9 | |||
10 | Fixes-commit: 99ae862a96a569724f49a604ebb7d3f6d2c2d374 | ||
11 | Signed-off-by: David Michael <fedora.dm0@gmail.com> | ||
12 | Upstream-Status: Backport | ||
13 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
14 | --- | ||
15 | |||
16 | diff --git a/src/gen-lock-obj.sh b/src/gen-lock-obj.sh | ||
17 | index a710f0c..258eec6 100755 | ||
18 | --- a/src/gen-lock-obj.sh | ||
19 | +++ b/src/gen-lock-obj.sh | ||
20 | @@ -38,7 +38,7 @@ | ||
21 | # AWK=gawk ./gen-lock-obj.sh | ||
22 | # | ||
23 | |||
24 | -if test -n `echo -n`; then | ||
25 | +if test -n "`echo -n`"; then | ||
26 | ECHO_C='\c' | ||
27 | ECHO_N='' | ||
28 | else | ||
diff --git a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch index 83054a9c44..aea8eba5fa 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch +++ b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ec309e20b5a27d42a5fb915c328d61e924ab5f19 Mon Sep 17 00:00:00 2001 | 1 | From 62651c5c7b4a391f16dbe1b09c6e220efe5c8a35 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Thu, 29 Mar 2018 15:12:17 +0800 | 3 | Date: Thu, 29 Mar 2018 15:12:17 +0800 |
4 | Subject: [PATCH] support pkgconfig | 4 | Subject: [PATCH] support pkgconfig |
@@ -12,15 +12,16 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
12 | Refactored for 1.33 | 12 | Refactored for 1.33 |
13 | Signed-off-by: Armin Kuster <akuster808@gmail.com> | 13 | Signed-off-by: Armin Kuster <akuster808@gmail.com> |
14 | Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> | 14 | Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> |
15 | |||
15 | --- | 16 | --- |
16 | src/gpg-error.m4 | 142 +---------------------------------------------- | 17 | src/gpg-error.m4 | 159 +---------------------------------------------- |
17 | 1 file changed, 3 insertions(+), 139 deletions(-) | 18 | 1 file changed, 3 insertions(+), 156 deletions(-) |
18 | 19 | ||
19 | diff --git a/src/gpg-error.m4 b/src/gpg-error.m4 | 20 | diff --git a/src/gpg-error.m4 b/src/gpg-error.m4 |
20 | index c9b235f..176bd6a 100644 | 21 | index d910754..76f045c 100644 |
21 | --- a/src/gpg-error.m4 | 22 | --- a/src/gpg-error.m4 |
22 | +++ b/src/gpg-error.m4 | 23 | +++ b/src/gpg-error.m4 |
23 | @@ -26,139 +26,12 @@ dnl is added to the gpg_config_script_warn variable. | 24 | @@ -27,156 +27,12 @@ dnl is added to the gpg_config_script_warn variable. |
24 | dnl | 25 | dnl |
25 | AC_DEFUN([AM_PATH_GPG_ERROR], | 26 | AC_DEFUN([AM_PATH_GPG_ERROR], |
26 | [ AC_REQUIRE([AC_CANONICAL_HOST]) | 27 | [ AC_REQUIRE([AC_CANONICAL_HOST]) |
@@ -62,45 +63,78 @@ index c9b235f..176bd6a 100644 | |||
62 | - min_gpg_error_version=ifelse([$1], ,1.33,$1) | 63 | - min_gpg_error_version=ifelse([$1], ,1.33,$1) |
63 | - ok=no | 64 | - ok=no |
64 | - | 65 | - |
65 | - if test "$prefix" = NONE ; then | 66 | - AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no) |
66 | - prefix_option_expanded=/usr/local | 67 | - if test "$GPGRT_CONFIG" != "no"; then |
67 | - else | 68 | - # Determine gpgrt_libdir |
68 | - prefix_option_expanded="$prefix" | 69 | - # |
69 | - fi | 70 | - # Get the prefix of gpgrt-config assuming it's something like: |
70 | - if test "$exec_prefix" = NONE ; then | 71 | - # <PREFIX>/bin/gpgrt-config |
71 | - exec_prefix_option_expanded=$prefix_option_expanded | 72 | - gpgrt_prefix=${GPGRT_CONFIG%/*/*} |
72 | - else | 73 | - possible_libdir1=${gpgrt_prefix}/lib |
73 | - exec_prefix_option_expanded=$(prefix=$prefix_option_expanded eval echo $exec_prefix) | 74 | - # Determine by using system libdir-format with CC, it's like: |
74 | - fi | 75 | - # Normal style: /usr/lib |
75 | - libdir_option_expanded=$(prefix=$prefix_option_expanded exec_prefix=$exec_prefix_option_expanded eval echo $libdir) | 76 | - # GNU cross style: /usr/<triplet>/lib |
77 | - # Debian style: /usr/lib/<multiarch-name> | ||
78 | - # Fedora/openSUSE style: /usr/lib, /usr/lib32 or /usr/lib64 | ||
79 | - # It is assumed that CC is specified to the one of host on cross build. | ||
80 | - if libdir_candidates=$(${CC:-cc} -print-search-dirs | \ | ||
81 | - sed -n -e "/^libraries/{s/libraries: =//;s/:/\n/gp}"); then | ||
82 | - # From the output of -print-search-dirs, select valid pkgconfig dirs. | ||
83 | - libdir_candidates=$(for dir in $libdir_candidates; do | ||
84 | - if p=$(cd $dir 2>/dev/null && pwd); then | ||
85 | - test -d "$p/pkgconfig" && echo $p; | ||
86 | - fi | ||
87 | - done) | ||
76 | - | 88 | - |
77 | - if test -f $libdir_option_expanded/pkgconfig/gpg-error.pc; then | 89 | - for possible_libdir0 in $libdir_candidates; do |
78 | - gpgrt_libdir=$libdir_option_expanded | 90 | - # possible_libdir0: |
79 | - else | 91 | - # Fallback candidate, the one of system-installed (by $CC) |
80 | - if crt1_path=$(${CC:-cc} -print-file-name=crt1.o 2>/dev/null); then | 92 | - # (/usr/<triplet>/lib, /usr/lib/<multiarch-name> or /usr/lib32) |
81 | - if possible_libdir=$(cd ${crt1_path%/*} && pwd 2>/dev/null); then | 93 | - # possible_libdir1: |
82 | - if test -f $possible_libdir/pkgconfig/gpg-error.pc; then | 94 | - # Another candidate, user-locally-installed |
83 | - gpgrt_libdir=$possible_libdir | 95 | - # (<gpgrt_prefix>/lib) |
96 | - # possible_libdir2 | ||
97 | - # Most preferred | ||
98 | - # (<gpgrt_prefix>/<triplet>/lib, | ||
99 | - # <gpgrt_prefix>/lib/<multiarch-name> or <gpgrt_prefix>/lib32) | ||
100 | - if test "${possible_libdir0##*/}" = "lib"; then | ||
101 | - possible_prefix0=${possible_libdir0%/lib} | ||
102 | - possible_prefix0_triplet=${possible_prefix0##*/} | ||
103 | - if test -z "$possible_prefix0_triplet"; then | ||
104 | - continue | ||
105 | - fi | ||
106 | - possible_libdir2=${gpgrt_prefix}/$possible_prefix0_triplet/lib | ||
107 | - else | ||
108 | - possible_prefix0=${possible_libdir0%%/lib*} | ||
109 | - possible_libdir2=${gpgrt_prefix}${possible_libdir0#$possible_prefix0} | ||
110 | - fi | ||
111 | - if test -f ${possible_libdir2}/pkgconfig/gpg-error.pc; then | ||
112 | - gpgrt_libdir=${possible_libdir2} | ||
113 | - elif test -f ${possible_libdir1}/pkgconfig/gpg-error.pc; then | ||
114 | - gpgrt_libdir=${possible_libdir1} | ||
115 | - elif test -f ${possible_libdir0}/pkgconfig/gpg-error.pc; then | ||
116 | - gpgrt_libdir=${possible_libdir0} | ||
84 | - fi | 117 | - fi |
85 | - fi | 118 | - if test -n "$gpgrt_libdir"; then break; fi |
119 | - done | ||
120 | - else | ||
121 | - # When we cannot determine system libdir-format, use this: | ||
122 | - gpgrt_libdir=${possible_libdir1} | ||
86 | - fi | 123 | - fi |
124 | - else | ||
125 | - unset GPGRT_CONFIG | ||
87 | - fi | 126 | - fi |
88 | - | 127 | - |
89 | - if test "$GPG_ERROR_CONFIG" = "no" -a -n "$gpgrt_libdir"; then | 128 | - if test -n "$gpgrt_libdir"; then |
90 | - AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no) | 129 | - GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir" |
91 | - if test "$GPGRT_CONFIG" = "no"; then | 130 | - if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then |
92 | - unset GPGRT_CONFIG | 131 | - GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error" |
132 | - AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config]) | ||
133 | - gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion` | ||
93 | - else | 134 | - else |
94 | - GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir" | 135 | - unset GPGRT_CONFIG |
95 | - if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then | ||
96 | - GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error" | ||
97 | - AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config]) | ||
98 | - gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion` | ||
99 | - else | ||
100 | - unset GPGRT_CONFIG | ||
101 | - fi | ||
102 | - fi | 136 | - fi |
103 | - else | 137 | - elif test "$GPG_ERROR_CONFIG" != "no"; then |
104 | - gpg_error_config_version=`$GPG_ERROR_CONFIG --version` | 138 | - gpg_error_config_version=`$GPG_ERROR_CONFIG --version` |
105 | - fi | 139 | - fi |
106 | - if test "$GPG_ERROR_CONFIG" != "no"; then | 140 | - if test "$GPG_ERROR_CONFIG" != "no"; then |
@@ -121,22 +155,6 @@ index c9b235f..176bd6a 100644 | |||
121 | - fi | 155 | - fi |
122 | - fi | 156 | - fi |
123 | - fi | 157 | - fi |
124 | - if test -z "$GPGRT_CONFIG" -a -n "$gpgrt_libdir"; then | ||
125 | - if test "$major" -gt 1 -o "$major" -eq 1 -a "$minor" -ge 33; then | ||
126 | - AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no) | ||
127 | - if test "$GPGRT_CONFIG" = "no"; then | ||
128 | - unset GPGRT_CONFIG | ||
129 | - else | ||
130 | - GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir" | ||
131 | - if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then | ||
132 | - GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error" | ||
133 | - AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config]) | ||
134 | - else | ||
135 | - unset GPGRT_CONFIG | ||
136 | - fi | ||
137 | - fi | ||
138 | - fi | ||
139 | - fi | ||
140 | - fi | 158 | - fi |
141 | - AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) | 159 | - AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) |
142 | + min_gpg_error_version=ifelse([$1], ,0.0,$1) | 160 | + min_gpg_error_version=ifelse([$1], ,0.0,$1) |
@@ -163,7 +181,7 @@ index c9b235f..176bd6a 100644 | |||
163 | fi | 181 | fi |
164 | if test x"$gpg_error_config_host" != xnone ; then | 182 | if test x"$gpg_error_config_host" != xnone ; then |
165 | if test x"$gpg_error_config_host" != x"$host" ; then | 183 | if test x"$gpg_error_config_host" != x"$host" ; then |
166 | @@ -174,15 +47,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], | 184 | @@ -192,15 +48,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], |
167 | fi | 185 | fi |
168 | fi | 186 | fi |
169 | else | 187 | else |
@@ -179,6 +197,3 @@ index c9b235f..176bd6a 100644 | |||
179 | - AC_SUBST(GPG_ERROR_MT_CFLAGS) | 197 | - AC_SUBST(GPG_ERROR_MT_CFLAGS) |
180 | - AC_SUBST(GPG_ERROR_MT_LIBS) | 198 | - AC_SUBST(GPG_ERROR_MT_LIBS) |
181 | ]) | 199 | ]) |
182 | -- | ||
183 | 2.25.1 | ||
184 | |||
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.41.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.42.bb index a0119729d8..c972d9a953 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error_1.41.bb +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.42.bb | |||
@@ -17,9 +17,11 @@ UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" | |||
17 | SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ | 17 | SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ |
18 | file://pkgconfig.patch \ | 18 | file://pkgconfig.patch \ |
19 | file://0001-Do-not-fail-when-testing-config-scripts.patch \ | 19 | file://0001-Do-not-fail-when-testing-config-scripts.patch \ |
20 | file://fix-cross.patch \ | ||
21 | file://0001-configure.ac-do-not-hardcode-gnu-libc-when-generatin.patch \ | ||
20 | " | 22 | " |
21 | 23 | ||
22 | SRC_URI[sha256sum] = "64b078b45ac3c3003d7e352a5e05318880a5778c42331ce1ef33d1a0d9922742" | 24 | SRC_URI[sha256sum] = "fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23" |
23 | 25 | ||
24 | BINCONFIG = "${bindir}/gpg-error-config" | 26 | BINCONFIG = "${bindir}/gpg-error-config" |
25 | 27 | ||