summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2019-01-02 08:36:15 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-03 21:16:00 +0000
commit142bfedad4e5eb829a3b321e57a947d7fe2f5145 (patch)
treedda787d787d5e7430a9078f4530fdb202e7f4afc /meta
parent3de1dca025864408b3728091d5efed62e11770ee (diff)
downloadpoky-142bfedad4e5eb829a3b321e57a947d7fe2f5145.tar.gz
libgpg-error: Update to 1.33
Drop patches now included in the update refactoered pkgconfig.patch (From OE-Core rev: cb38ff242cf3e1a9cda726703bd12778bde38f93) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error/0001-syscfg-Support-ARC-CPUs-and-simplify-aliasing-table.patch298
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error/0002-syscfg-Add-support-for-arc-unknown-linux-gnu.patch35
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch178
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error_1.33.bb (renamed from meta/recipes-support/libgpg-error/libgpg-error_1.32.bb)7
4 files changed, 101 insertions, 417 deletions
diff --git a/meta/recipes-support/libgpg-error/libgpg-error/0001-syscfg-Support-ARC-CPUs-and-simplify-aliasing-table.patch b/meta/recipes-support/libgpg-error/libgpg-error/0001-syscfg-Support-ARC-CPUs-and-simplify-aliasing-table.patch
deleted file mode 100644
index 03b0ce77ed..0000000000
--- a/meta/recipes-support/libgpg-error/libgpg-error/0001-syscfg-Support-ARC-CPUs-and-simplify-aliasing-table.patch
+++ /dev/null
@@ -1,298 +0,0 @@
1From d4fd6975671477721936060771aa4d7d07fb0910 Mon Sep 17 00:00:00 2001
2From: Werner Koch <wk@gnupg.org>
3Date: Tue, 18 Sep 2018 14:54:08 +0200
4Subject: [PATCH libgpg-error] syscfg: Support ARC CPUs and simplify aliasing
5 table.
6
7* src/mkheader.c (xmalloc): New.
8(xstrdup): Implement using xmalloc.
9(canon_host_triplet): Add supporr for arc CPU. Adjust alias table to
10also alias *-pc-*. Rename ibm to unknown. Add internal arg. Add
11unknown vendor hack.
12(main): New mode to just print the canonicalized form.
13* src/Makefile.am (lock_obj_pub): s/-(pc|ibm)-/-unknown/. Also rename
14files accordingly.
15--
16
17config.sub does no real aliasing and thus we would need to add several
18vendors to the alising tables despite that this has no technical
19meanding. Instead we now replace the vendor with "unknown" for the
204-part-"triplets". This change will make maintenace easier.
21
22Signed-off-by: Werner Koch <wk@gnupg.org>
23
24Upstream-Status: Backport [ http://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commit;h=48c8f8ddfc80 ]
25---
26 src/Makefile.am | 16 ++--
27 src/mkheader.c | 92 ++++++++++++++++---
28 ...-gnu.h => lock-obj-pub.i686-unknown-gnu.h} | 0
29 ... lock-obj-pub.i686-unknown-kfreebsd-gnu.h} | 0
30 ... => lock-obj-pub.i686-unknown-linux-gnu.h} | 0
31 ...=> lock-obj-pub.s390x-unknown-linux-gnu.h} | 0
32 ...ock-obj-pub.x86_64-unknown-kfreebsd-gnu.h} | 0
33 ...> lock-obj-pub.x86_64-unknown-linux-gnu.h} | 0
34 ...ock-obj-pub.x86_64-unknown-linux-gnux32.h} | 0
35 ... lock-obj-pub.x86_64-unknown-linux-musl.h} | 0
36 10 files changed, 85 insertions(+), 23 deletions(-)
37 rename src/syscfg/{lock-obj-pub.i686-pc-gnu.h => lock-obj-pub.i686-unknown-gnu.h} (100%)
38 rename src/syscfg/{lock-obj-pub.i686-pc-kfreebsd-gnu.h => lock-obj-pub.i686-unknown-kfreebsd-gnu.h} (100%)
39 rename src/syscfg/{lock-obj-pub.i686-pc-linux-gnu.h => lock-obj-pub.i686-unknown-linux-gnu.h} (100%)
40 rename src/syscfg/{lock-obj-pub.s390x-ibm-linux-gnu.h => lock-obj-pub.s390x-unknown-linux-gnu.h} (100%)
41 rename src/syscfg/{lock-obj-pub.x86_64-pc-kfreebsd-gnu.h => lock-obj-pub.x86_64-unknown-kfreebsd-gnu.h} (100%)
42 rename src/syscfg/{lock-obj-pub.x86_64-pc-linux-gnu.h => lock-obj-pub.x86_64-unknown-linux-gnu.h} (100%)
43 rename src/syscfg/{lock-obj-pub.x86_64-pc-linux-gnux32.h => lock-obj-pub.x86_64-unknown-linux-gnux32.h} (100%)
44 rename src/syscfg/{lock-obj-pub.x86_64-pc-linux-musl.h => lock-obj-pub.x86_64-unknown-linux-musl.h} (100%)
45
46diff --git a/src/Makefile.am b/src/Makefile.am
47index 42998e46a3bc..8ec582ef99fb 100644
48--- a/src/Makefile.am
49+++ b/src/Makefile.am
50@@ -52,9 +52,9 @@ lock_obj_pub = \
51 syscfg/lock-obj-pub.arm-apple-darwin.h \
52 syscfg/lock-obj-pub.hppa-unknown-linux-gnu.h \
53 syscfg/lock-obj-pub.i386-apple-darwin.h \
54- syscfg/lock-obj-pub.i686-pc-gnu.h \
55- syscfg/lock-obj-pub.i686-pc-kfreebsd-gnu.h \
56- syscfg/lock-obj-pub.i686-pc-linux-gnu.h \
57+ syscfg/lock-obj-pub.i686-unknown-gnu.h \
58+ syscfg/lock-obj-pub.i686-unknown-kfreebsd-gnu.h \
59+ syscfg/lock-obj-pub.i686-unknown-linux-gnu.h \
60 syscfg/lock-obj-pub.m68k-unknown-linux-gnu.h \
61 syscfg/lock-obj-pub.mips-unknown-linux-gnu.h \
62 syscfg/lock-obj-pub.mips64el-unknown-linux-gnuabi64.h \
63@@ -66,16 +66,16 @@ lock_obj_pub = \
64 syscfg/lock-obj-pub.powerpc64le-unknown-linux-gnu.h \
65 syscfg/lock-obj-pub.powerpc-unknown-linux-gnuspe.h \
66 syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h \
67- syscfg/lock-obj-pub.s390x-ibm-linux-gnu.h \
68+ syscfg/lock-obj-pub.s390x-unknown-linux-gnu.h \
69 syscfg/lock-obj-pub.sh3-unknown-linux-gnu.h \
70 syscfg/lock-obj-pub.sh4-unknown-linux-gnu.h \
71 syscfg/lock-obj-pub.sparc-unknown-linux-gnu.h \
72 syscfg/lock-obj-pub.sparc64-unknown-linux-gnu.h \
73 syscfg/lock-obj-pub.x86_64-apple-darwin.h \
74- syscfg/lock-obj-pub.x86_64-pc-kfreebsd-gnu.h \
75- syscfg/lock-obj-pub.x86_64-pc-linux-gnu.h \
76- syscfg/lock-obj-pub.x86_64-pc-linux-gnux32.h \
77- syscfg/lock-obj-pub.x86_64-pc-linux-musl.h \
78+ syscfg/lock-obj-pub.x86_64-unknown-kfreebsd-gnu.h \
79+ syscfg/lock-obj-pub.x86_64-unknown-linux-gnu.h \
80+ syscfg/lock-obj-pub.x86_64-unknown-linux-gnux32.h \
81+ syscfg/lock-obj-pub.x86_64-unknown-linux-musl.h \
82 syscfg/lock-obj-pub.tilegx-unknown-linux-gnu.h \
83 syscfg/lock-obj-pub.ia64-unknown-linux-gnu.h \
84 syscfg/lock-obj-pub.mingw32.h
85diff --git a/src/mkheader.c b/src/mkheader.c
86index 2fc5fada66a4..7a38a1bec1a4 100644
87--- a/src/mkheader.c
88+++ b/src/mkheader.c
89@@ -51,17 +51,27 @@ xfree (void *a)
90
91
92 static char *
93-xstrdup (const char *string)
94+xmalloc (size_t n)
95 {
96 char *p;
97- size_t len = strlen (string) + 1;
98
99- p = malloc (len);
100+ p = malloc (n);
101 if (!p)
102 {
103 fputs (PGM ": out of core\n", stderr);
104 exit (1);
105 }
106+ return p;
107+}
108+
109+
110+static char *
111+xstrdup (const char *string)
112+{
113+ char *p;
114+ size_t len = strlen (string) + 1;
115+
116+ p = xmalloc (len);
117 memcpy (p, string, len);
118 return p;
119 }
120@@ -69,23 +79,31 @@ xstrdup (const char *string)
121
122 /* Return a malloced string with TRIPLET. If TRIPLET has an alias
123 return that instead. In general build-aux/config.sub should do the
124- aliasing but some returned triplets are anyway identical and thus we
125- use this function to map it to the canonical form. */
126+ aliasing but some returned triplets are anyway identical and thus
127+ we use this function to map it to the canonical form.
128+ NO_VENDOR_HACK is for internal use; caller must call with 0. */
129 static char *
130-canon_host_triplet (const char *triplet)
131+canon_host_triplet (const char *triplet, int no_vendor_hack)
132 {
133 struct {
134 const char *name;
135 const char *alias;
136 } tbl[] = {
137- {"i486-pc-linux-gnu", "i686-pc-linux-gnu" },
138+ {"i486-pc-linux-gnu", "i686-unknown-linux-gnu" },
139 {"i586-pc-linux-gnu" },
140- {"i486-pc-gnu", "i686-pc-gnu"},
141+ {"i686-pc-linux-gnu" },
142+ {"arc-oe-linux-uclibc" }, /* Other CPU but same struct. */
143+
144+ {"i486-pc-gnu", "i686-unknown-gnu"},
145 {"i586-pc-gnu"},
146- {"i486-pc-kfreebsd-gnu", "i686-pc-kfreebsd-gnu"},
147+ {"i686-pc-gnu"},
148+
149+ {"i486-pc-kfreebsd-gnu", "i686-unknown-kfreebsd-gnu"},
150 {"i586-pc-kfreebsd-gnu"},
151+ {"i686-pc-kfreebsd-gnu"},
152
153- {"x86_64-pc-linux-gnuhardened1", "x86_64-pc-linux-gnu" },
154+ {"x86_64-pc-linux-gnuhardened1", "x86_64-unknown-linux-gnu" },
155+ {"x86_64-pc-linux-gnu" },
156
157 {"powerpc-unknown-linux-gnuspe", "powerpc-unknown-linux-gnu" },
158
159@@ -98,6 +116,7 @@ canon_host_triplet (const char *triplet)
160 };
161 int i;
162 const char *lastalias = NULL;
163+ const char *s;
164
165 for (i=0; tbl[i].name; i++)
166 {
167@@ -110,6 +129,36 @@ canon_host_triplet (const char *triplet)
168 return xstrdup (lastalias);
169 }
170 }
171+ for (i=0, s=triplet; *s; s++)
172+ if (*s == '-')
173+ i++;
174+ if (i > 2 && !no_vendor_hack)
175+ {
176+ /* We have a 4 part "triplet": CPU-VENDOR-KERNEL-SYSTEM where
177+ * the last two parts replace the OS part of a real triplet.
178+ * The VENDOR part is then in general useless because
179+ * KERNEL-SYSTEM is specific enough. We now do a second pass by
180+ * replacing VENDOR with "unknown". */
181+ char *p;
182+ char *buf = xmalloc (strlen (triplet) + 7 + 1);
183+
184+ for (p=buf,s=triplet,i=0; *s; s++)
185+ {
186+ *p++ = *s;
187+ if (*s == '-' && ++i == 1)
188+ {
189+ memcpy (p, "unknown-",8);
190+ p += 8;
191+ for (s++; *s != '-'; s++)
192+ ;
193+ }
194+ }
195+ *p = 0;
196+ p = canon_host_triplet (buf, 1);
197+ xfree (buf);
198+ return p;
199+ }
200+
201 return xstrdup (triplet);
202 }
203
204@@ -558,7 +607,7 @@ write_special (const char *fname, int lnr, const char *tag)
205 int
206 main (int argc, char **argv)
207 {
208- FILE *fp;
209+ FILE *fp = NULL;
210 char line[LINESIZE];
211 int lnr = 0;
212 const char *fname, *s;
213@@ -571,11 +620,22 @@ main (int argc, char **argv)
214 argc--; argv++;
215 }
216
217- if (argc != 6)
218+ if (argc == 1)
219+ {
220+ /* Print just the canonicalized host triplet. */
221+ host_triplet = canon_host_triplet (argv[0], 0);
222+ printf ("%s\n", host_triplet);
223+ goto leave;
224+ }
225+ else if (argc == 6)
226+ ; /* Standard operation. */
227+ else
228 {
229 fputs ("usage: " PGM
230 " host_os host_triplet template.h config.h"
231- " version version_number\n",
232+ " version version_number\n"
233+ " " PGM
234+ " host_triplet\n",
235 stderr);
236 return 1;
237 }
238@@ -586,7 +646,7 @@ main (int argc, char **argv)
239 hdr_version = argv[4];
240 hdr_version_number = argv[5];
241
242- host_triplet = canon_host_triplet (host_triplet_raw);
243+ host_triplet = canon_host_triplet (host_triplet_raw, 0);
244
245 srcdir = malloc (strlen (fname) + 2 + 1);
246 if (!srcdir)
247@@ -677,13 +737,15 @@ main (int argc, char **argv)
248 "End:\n"
249 "*/\n", stdout);
250
251+ leave:
252 if (ferror (stdout))
253 {
254 fprintf (stderr, PGM ": error writing to stdout: %s\n", strerror (errno));
255 return 1;
256 }
257
258- fclose (fp);
259+ if (fp)
260+ fclose (fp);
261
262 xfree (host_triplet);
263 return 0;
264diff --git a/src/syscfg/lock-obj-pub.i686-pc-gnu.h b/src/syscfg/lock-obj-pub.i686-unknown-gnu.h
265similarity index 100%
266rename from src/syscfg/lock-obj-pub.i686-pc-gnu.h
267rename to src/syscfg/lock-obj-pub.i686-unknown-gnu.h
268diff --git a/src/syscfg/lock-obj-pub.i686-pc-kfreebsd-gnu.h b/src/syscfg/lock-obj-pub.i686-unknown-kfreebsd-gnu.h
269similarity index 100%
270rename from src/syscfg/lock-obj-pub.i686-pc-kfreebsd-gnu.h
271rename to src/syscfg/lock-obj-pub.i686-unknown-kfreebsd-gnu.h
272diff --git a/src/syscfg/lock-obj-pub.i686-pc-linux-gnu.h b/src/syscfg/lock-obj-pub.i686-unknown-linux-gnu.h
273similarity index 100%
274rename from src/syscfg/lock-obj-pub.i686-pc-linux-gnu.h
275rename to src/syscfg/lock-obj-pub.i686-unknown-linux-gnu.h
276diff --git a/src/syscfg/lock-obj-pub.s390x-ibm-linux-gnu.h b/src/syscfg/lock-obj-pub.s390x-unknown-linux-gnu.h
277similarity index 100%
278rename from src/syscfg/lock-obj-pub.s390x-ibm-linux-gnu.h
279rename to src/syscfg/lock-obj-pub.s390x-unknown-linux-gnu.h
280diff --git a/src/syscfg/lock-obj-pub.x86_64-pc-kfreebsd-gnu.h b/src/syscfg/lock-obj-pub.x86_64-unknown-kfreebsd-gnu.h
281similarity index 100%
282rename from src/syscfg/lock-obj-pub.x86_64-pc-kfreebsd-gnu.h
283rename to src/syscfg/lock-obj-pub.x86_64-unknown-kfreebsd-gnu.h
284diff --git a/src/syscfg/lock-obj-pub.x86_64-pc-linux-gnu.h b/src/syscfg/lock-obj-pub.x86_64-unknown-linux-gnu.h
285similarity index 100%
286rename from src/syscfg/lock-obj-pub.x86_64-pc-linux-gnu.h
287rename to src/syscfg/lock-obj-pub.x86_64-unknown-linux-gnu.h
288diff --git a/src/syscfg/lock-obj-pub.x86_64-pc-linux-gnux32.h b/src/syscfg/lock-obj-pub.x86_64-unknown-linux-gnux32.h
289similarity index 100%
290rename from src/syscfg/lock-obj-pub.x86_64-pc-linux-gnux32.h
291rename to src/syscfg/lock-obj-pub.x86_64-unknown-linux-gnux32.h
292diff --git a/src/syscfg/lock-obj-pub.x86_64-pc-linux-musl.h b/src/syscfg/lock-obj-pub.x86_64-unknown-linux-musl.h
293similarity index 100%
294rename from src/syscfg/lock-obj-pub.x86_64-pc-linux-musl.h
295rename to src/syscfg/lock-obj-pub.x86_64-unknown-linux-musl.h
296--
2972.17.1
298
diff --git a/meta/recipes-support/libgpg-error/libgpg-error/0002-syscfg-Add-support-for-arc-unknown-linux-gnu.patch b/meta/recipes-support/libgpg-error/libgpg-error/0002-syscfg-Add-support-for-arc-unknown-linux-gnu.patch
deleted file mode 100644
index 197652f283..0000000000
--- a/meta/recipes-support/libgpg-error/libgpg-error/0002-syscfg-Add-support-for-arc-unknown-linux-gnu.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From ae6a3f20345dac4b9daab8c39ac2d3fb3f2c21e3 Mon Sep 17 00:00:00 2001
2From: Werner Koch <wk@gnupg.org>
3Date: Fri, 21 Sep 2018 14:37:21 +0200
4Subject: [PATCH Libgpg-error] syscfg: Add support for arc-unknown-linux-gnu
5
6* src/mkheader.c (canon_host_triplet): Add to table.
7--
8
9Note that unknown in the above triplet is actually a wildcard for 4
10part triplets.
11
12Signed-off-by: Werner Koch <wk@gnupg.org>
13
14Upstream-Status: Backport [http://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commit;h=f4f0da74f526d7e35cedbc2e93454df6440dbfa5]
15---
16 src/mkheader.c | 3 ++-
17 1 file changed, 2 insertions(+), 1 deletion(-)
18
19diff --git a/src/mkheader.c b/src/mkheader.c
20index 7a38a1bec1a4..a4866e96ef43 100644
21--- a/src/mkheader.c
22+++ b/src/mkheader.c
23@@ -92,7 +92,8 @@ canon_host_triplet (const char *triplet, int no_vendor_hack)
24 {"i486-pc-linux-gnu", "i686-unknown-linux-gnu" },
25 {"i586-pc-linux-gnu" },
26 {"i686-pc-linux-gnu" },
27- {"arc-oe-linux-uclibc" }, /* Other CPU but same struct. */
28+ {"arc-oe-linux-gnu" }, /* Other CPU but same struct. */
29+ {"arc-oe-linux-uclibc" }, /* and uclibc is also the same. */
30
31 {"i486-pc-gnu", "i686-unknown-gnu"},
32 {"i586-pc-gnu"},
33--
342.17.1
35
diff --git a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch
index 3066613d42..ca5f6b5c25 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch
+++ b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch
@@ -8,53 +8,21 @@ Upstream-Status: Pending
8Rebase to 1.28 8Rebase to 1.28
9 9
10Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 10Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
11
12Refactored for 1.33
13Signed-off-by: Armin Kuster <akuster808@gmail.com>
14
11--- 15---
12 configure.ac | 1 + 16 configure.ac | 1 +
13 src/Makefile.am | 4 ++-
14 src/gpg-error.m4 | 71 +++-------------------------------------------------- 17 src/gpg-error.m4 | 71 +++--------------------------------------------------
15 src/gpg-error.pc.in | 11 +++++++++
16 4 files changed, 18 insertions(+), 69 deletions(-) 18 4 files changed, 18 insertions(+), 69 deletions(-)
17 create mode 100644 src/gpg-error.pc.in 19 create mode 100644 src/gpg-error.pc.in
18 20
19diff --git a/configure.ac b/configure.ac 21Index: libgpg-error-1.33/src/gpg-error.m4
20index aca9300..f7794e9 100644 22===================================================================
21--- a/configure.ac 23--- libgpg-error-1.33.orig/src/gpg-error.m4
22+++ b/configure.ac 24+++ libgpg-error-1.33/src/gpg-error.m4
23@@ -621,6 +621,7 @@ AC_CONFIG_FILES([src/Makefile tests/Makefile]) 25@@ -26,139 +26,13 @@ dnl is added to the gpg_config_script_wa
24 AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpg-error.asd])
25 AC_CONFIG_FILES([src/versioninfo.rc src/gpg-error.w32-manifest])
26 AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config])
27+AC_CONFIG_FILES([src/gpg-error.pc])
28
29 AC_OUTPUT
30
31diff --git a/src/Makefile.am b/src/Makefile.am
32index 268c2ab..95f8459 100644
33--- a/src/Makefile.am
34+++ b/src/Makefile.am
35@@ -87,6 +87,8 @@ bin_SCRIPTS = gpg-error-config
36 nodist_bin_SCRIPTS = gpgrt-config
37 m4datadir = $(datadir)/aclocal
38 m4data_DATA = gpg-error.m4 gpgrt.m4
39+pkgconfigdir = $(libdir)/pkgconfig
40+pkgconfig_DATA = gpg-error.pc
41
42 EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \
43 mkerrnos.awk errnos.in README \
44@@ -94,7 +96,7 @@ EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \
45 mkheader.c gpg-error.h.in mkw32errmap.c w32-add.h w32ce-add.h \
46 err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 gpgrt.m4 \
47 gpg-error.vers gpg-error.def.in \
48- versioninfo.rc.in gpg-error.w32-manifest.in \
49+ versioninfo.rc.in gpg-error.w32-manifest.in gpg-error.pc \
50 $(lock_obj_pub)
51
52 BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \
53diff --git a/src/gpg-error.m4 b/src/gpg-error.m4
54index 60c88d8..2ef7e3e 100644
55--- a/src/gpg-error.m4
56+++ b/src/gpg-error.m4
57@@ -26,73 +26,13 @@ dnl is added to the gpg_config_script_warn variable.
58 dnl 26 dnl
59 AC_DEFUN([AM_PATH_GPG_ERROR], 27 AC_DEFUN([AM_PATH_GPG_ERROR],
60 [ AC_REQUIRE([AC_CANONICAL_HOST]) 28 [ AC_REQUIRE([AC_CANONICAL_HOST])
@@ -66,14 +34,15 @@ index 60c88d8..2ef7e3e 100644
66- AC_HELP_STRING([--with-libgpg-error-prefix=PFX], 34- AC_HELP_STRING([--with-libgpg-error-prefix=PFX],
67- [prefix where GPG Error is installed (optional)]), 35- [prefix where GPG Error is installed (optional)]),
68- [gpg_error_config_prefix="$withval"]) 36- [gpg_error_config_prefix="$withval"])
69- 37+ min_gpg_error_version=ifelse([$1], ,0.0,$1)
38+ PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version], [ok=yes], [ok=no])
39
70- dnl Accept --with-gpg-error-prefix and make it work the same as 40- dnl Accept --with-gpg-error-prefix and make it work the same as
71- dnl --with-libgpg-error-prefix above, for backwards compatibility, 41- dnl --with-libgpg-error-prefix above, for backwards compatibility,
72- dnl but do not document this old, inconsistently-named option. 42- dnl but do not document this old, inconsistently-named option.
73- AC_ARG_WITH(gpg-error-prefix,, 43- AC_ARG_WITH(gpg-error-prefix,,
74- [gpg_error_config_prefix="$withval"]) 44- [gpg_error_config_prefix="$withval"])
75+ min_gpg_error_version=ifelse([$1], ,0.0,$1) 45-
76
77- if test x"${GPG_ERROR_CONFIG}" = x ; then 46- if test x"${GPG_ERROR_CONFIG}" = x ; then
78- if test x"${gpg_error_config_prefix}" != x ; then 47- if test x"${gpg_error_config_prefix}" != x ; then
79- GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config" 48- GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config"
@@ -92,19 +61,57 @@ index 60c88d8..2ef7e3e 100644
92- esac 61- esac
93- fi 62- fi
94- fi 63- fi
95+ PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version], [ok=yes], [ok=no]) 64-
96
97- AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no) 65- AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no)
98- min_gpg_error_version=ifelse([$1], ,0.0,$1) 66- min_gpg_error_version=ifelse([$1], ,1.33,$1)
99- AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
100- ok=no 67- ok=no
101- if test "$GPG_ERROR_CONFIG" != "no" \ 68-
102- && test -f "$GPG_ERROR_CONFIG" ; then 69- if test "$prefix" = NONE ; then
70- prefix_option_expanded=/usr/local
71- else
72- prefix_option_expanded="$prefix"
73- fi
74- if test "$exec_prefix" = NONE ; then
75- exec_prefix_option_expanded=$prefix_option_expanded
76- else
77- exec_prefix_option_expanded=$(prefix=$prefix_option_expanded eval echo $exec_prefix)
78- fi
79- libdir_option_expanded=$(prefix=$prefix_option_expanded exec_prefix=$exec_prefix_option_expanded eval echo $libdir)
80-
81- if test -f $libdir_option_expanded/pkgconfig/gpg-error.pc; then
82- gpgrt_libdir=$libdir_option_expanded
83- else
84- if crt1_path=$(${CC:-cc} -print-file-name=crt1.o 2>/dev/null); then
85- if possible_libdir=$(cd ${crt1_path%/*} && pwd 2>/dev/null); then
86- if test -f $possible_libdir/pkgconfig/gpg-error.pc; then
87- gpgrt_libdir=$possible_libdir
88- fi
89- fi
90- fi
91- fi
92-
93- if test "$GPG_ERROR_CONFIG" = "no" -a -n "$gpgrt_libdir"; then
94- AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no)
95- if test "$GPGRT_CONFIG" = "no"; then
96- unset GPGRT_CONFIG
97- else
98- GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir"
99- if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then
100- GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
101- AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config])
102- gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion`
103- else
104- unset GPGRT_CONFIG
105- fi
106- fi
107- else
108- gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
109- fi
110- if test "$GPG_ERROR_CONFIG" != "no"; then
103- req_major=`echo $min_gpg_error_version | \ 111- req_major=`echo $min_gpg_error_version | \
104- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` 112- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
105- req_minor=`echo $min_gpg_error_version | \ 113- req_minor=`echo $min_gpg_error_version | \
106- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` 114- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
107- gpg_error_config_version=`$GPG_ERROR_CONFIG $gpg_error_config_args --version`
108- major=`echo $gpg_error_config_version | \ 115- major=`echo $gpg_error_config_version | \
109- sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` 116- sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
110- minor=`echo $gpg_error_config_version | \ 117- minor=`echo $gpg_error_config_version | \
@@ -118,20 +125,47 @@ index 60c88d8..2ef7e3e 100644
118- fi 125- fi
119- fi 126- fi
120- fi 127- fi
128- if test -z "$GPGRT_CONFIG" -a -n "$gpgrt_libdir"; then
129- if test "$major" -gt 1 -o "$major" -eq 1 -a "$minor" -ge 33; then
130- AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no)
131- if test "$GPGRT_CONFIG" = "no"; then
132- unset GPGRT_CONFIG
133- else
134- GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir"
135- if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then
136- GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
137- AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config])
138- else
139- unset GPGRT_CONFIG
140- fi
141- fi
142- fi
143- fi
121- fi 144- fi
145- AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
122 if test $ok = yes; then 146 if test $ok = yes; then
123- GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags` 147- GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG --cflags`
124- GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs` 148- GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG --libs`
125- GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --cflags 2>/dev/null` 149- if test -z "$GPGRT_CONFIG"; then
126- GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --libs 2>/dev/null` 150- GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG --mt --cflags 2>/dev/null`
151- GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG --mt --libs 2>/dev/null`
152- else
153- GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG --variable=mtcflags 2>/dev/null`
154- GPG_ERROR_MT_CFLAGS="$GPG_ERROR_CFLAGS${GPG_ERROR_CFLAGS:+ }$GPG_ERROR_MT_CFLAGS"
155- GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG --variable=mtlibs 2>/dev/null`
156- GPG_ERROR_MT_LIBS="$GPG_ERROR_LIBS${GPG_ERROR_LIBS:+ }$GPG_ERROR_MT_LIBS"
157- fi
127- AC_MSG_RESULT([yes ($gpg_error_config_version)]) 158- AC_MSG_RESULT([yes ($gpg_error_config_version)])
128 ifelse([$2], , :, [$2]) 159 ifelse([$2], , :, [$2])
129- gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none` 160 if test -z "$GPGRT_CONFIG"; then
130+ gpg_error_config_host=`$PKG_CONFIG --variable=host gpg-error` 161- gpg_error_config_host=`$GPG_ERROR_CONFIG --host 2>/dev/null || echo none`
162- else
163- gpg_error_config_host=`$GPG_ERROR_CONFIG --variable=host 2>/dev/null || echo none`
164+ gpg_error_config_host=`$PKG_CONFIG --variable=host gpg-error`
165 fi
131 if test x"$gpg_error_config_host" != xnone ; then 166 if test x"$gpg_error_config_host" != xnone ; then
132 if test x"$gpg_error_config_host" != x"$host" ; then 167 if test x"$gpg_error_config_host" != x"$host" ; then
133 AC_MSG_WARN([[ 168@@ -174,15 +48,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
134@@ -107,11 +47,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
135 fi 169 fi
136 fi 170 fi
137 else 171 else
@@ -142,24 +176,8 @@ index 60c88d8..2ef7e3e 100644
142- AC_MSG_RESULT(no) 176- AC_MSG_RESULT(no)
143 ifelse([$3], , :, [$3]) 177 ifelse([$3], , :, [$3])
144 fi 178 fi
145 AC_SUBST(GPG_ERROR_CFLAGS) 179- AC_SUBST(GPG_ERROR_CFLAGS)
146diff --git a/src/gpg-error.pc.in b/src/gpg-error.pc.in 180- AC_SUBST(GPG_ERROR_LIBS)
147new file mode 100644 181- AC_SUBST(GPG_ERROR_MT_CFLAGS)
148index 0000000..bc0b174 182- AC_SUBST(GPG_ERROR_MT_LIBS)
149--- /dev/null 183 ])
150+++ b/src/gpg-error.pc.in
151@@ -0,0 +1,11 @@
152+prefix=@prefix@
153+exec_prefix=@exec_prefix@
154+libdir=@libdir@
155+includedir=@includedir@
156+host=@GPG_ERROR_CONFIG_HOST@
157+
158+Name: gpg-error
159+Description: a library that defines common error values for all GnuPG components
160+Version: @VERSION@
161+Libs: -L${libdir} -lgpg-error
162+Cflags: -I${includedir}
163--
1641.8.3.1
165
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.32.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.33.bb
index e552001cb6..325529d149 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.32.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.33.bb
@@ -14,11 +14,10 @@ SECTION = "libs"
14UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" 14UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
15SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ 15SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
16 file://pkgconfig.patch \ 16 file://pkgconfig.patch \
17 file://0001-syscfg-Support-ARC-CPUs-and-simplify-aliasing-table.patch \
18 file://0002-syscfg-Add-support-for-arc-unknown-linux-gnu.patch \
19 " 17 "
20SRC_URI[md5sum] = "ef3d928a5a453fa701ecc3bb22be1c64" 18
21SRC_URI[sha256sum] = "c345c5e73cc2332f8d50db84a2280abfb1d8f6d4f1858b9daa30404db44540ca" 19SRC_URI[md5sum] = "680495572d5d4c700ea73a2f793ce531"
20SRC_URI[sha256sum] = "5d38826656e746c936e7742d9cde072b50baa3c4c49daa168a56813612bf03ff"
22 21
23BINCONFIG = "${bindir}/gpg-error-config" 22BINCONFIG = "${bindir}/gpg-error-config"
24 23