diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2020-01-07 13:19:32 +0100 |
---|---|---|
committer | Ross Burton <ross.burton@intel.com> | 2020-01-07 12:55:32 +0000 |
commit | 101ebd96bf2b2e343cd4e08b241df45a74b33758 (patch) | |
tree | 2887757903d65ce3908ad1b59297955e0a69b77d /recipes-support | |
parent | e3979dcefbf3f4ef7a489ea932b1cccd1c68e7be (diff) | |
download | meta-gplv2-101ebd96bf2b2e343cd4e08b241df45a74b33758.tar.gz |
gnupg: Make it build with gettext 0.20
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'recipes-support')
-rw-r--r-- | recipes-support/gnupg/gnupg-1.4.7/0001-Make-it-build-with-gettext-0.20.patch | 80 | ||||
-rw-r--r-- | recipes-support/gnupg/gnupg_1.4.7.bb | 3 |
2 files changed, 82 insertions, 1 deletions
diff --git a/recipes-support/gnupg/gnupg-1.4.7/0001-Make-it-build-with-gettext-0.20.patch b/recipes-support/gnupg/gnupg-1.4.7/0001-Make-it-build-with-gettext-0.20.patch new file mode 100644 index 0000000..a8eddbe --- /dev/null +++ b/recipes-support/gnupg/gnupg-1.4.7/0001-Make-it-build-with-gettext-0.20.patch | |||
@@ -0,0 +1,80 @@ | |||
1 | From 26076b28b79f6a2f2989a301ad7474cfa1153ebd Mon Sep 17 00:00:00 2001 | ||
2 | From: Peter Kjellerstedt <pkj@axis.com> | ||
3 | Date: Tue, 7 Jan 2020 11:08:39 +0100 | ||
4 | Subject: [PATCH] Make it build with gettext 0.20 | ||
5 | |||
6 | Upstream-Status: Inappropriate [legacy version] | ||
7 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | ||
8 | --- | ||
9 | Makefile.am | 2 +- | ||
10 | configure.ac | 2 +- | ||
11 | g10/Makefile.am | 2 +- | ||
12 | keyserver/Makefile.am | 2 +- | ||
13 | tools/Makefile.am | 2 +- | ||
14 | 5 files changed, 5 insertions(+), 5 deletions(-) | ||
15 | |||
16 | diff --git a/Makefile.am b/Makefile.am | ||
17 | index 3423e70..1eebbc2 100644 | ||
18 | --- a/Makefile.am | ||
19 | +++ b/Makefile.am | ||
20 | @@ -28,7 +28,7 @@ else | ||
21 | checks = checks | ||
22 | endif | ||
23 | |||
24 | -SUBDIRS = m4 intl zlib util mpi cipher tools g10 keyserver po doc ${checks} | ||
25 | +SUBDIRS = m4 zlib util mpi cipher tools g10 keyserver po doc ${checks} | ||
26 | EXTRA_DIST = scripts/config.rpath PROJECTS BUGS config.h.in autogen.sh | ||
27 | DISTCLEANFILES = | ||
28 | |||
29 | diff --git a/configure.ac b/configure.ac | ||
30 | index 9f64b75..d9e5f69 100644 | ||
31 | --- a/configure.ac | ||
32 | +++ b/configure.ac | ||
33 | @@ -813,7 +813,7 @@ dnl Checks for libraries. | ||
34 | |||
35 | AM_GNU_GETTEXT_VERSION(0.14.1) | ||
36 | if test "$try_gettext" = yes; then | ||
37 | - AM_GNU_GETTEXT(,[need-ngettext]) | ||
38 | + AM_GNU_GETTEXT([external],[need-ngettext]) | ||
39 | |||
40 | # gettext requires some extra checks. These really should be part of | ||
41 | # the basic AM_GNU_GETTEXT macro. TODO: move other gettext-specific | ||
42 | diff --git a/g10/Makefile.am b/g10/Makefile.am | ||
43 | index 74a8db1..ff51b7f 100644 | ||
44 | --- a/g10/Makefile.am | ||
45 | +++ b/g10/Makefile.am | ||
46 | @@ -32,7 +32,7 @@ AM_CPPFLAGS += -DGNUPG_LIBDIR="\"$(libdir)/@PACKAGE@\"" | ||
47 | endif | ||
48 | |||
49 | needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a | ||
50 | -other_libs = $(LIBICONV) $(DNSLIBS) $(LIBINTL) $(CAPLIBS) | ||
51 | +other_libs = $(DNSLIBS) $(LIBINTL) $(CAPLIBS) | ||
52 | |||
53 | bin_PROGRAMS = gpg gpgv | ||
54 | dist_pkgdata_DATA = options.skel | ||
55 | diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am | ||
56 | index 3379910..3527c60 100644 | ||
57 | --- a/keyserver/Makefile.am | ||
58 | +++ b/keyserver/Makefile.am | ||
59 | @@ -33,7 +33,7 @@ gpgkeys_hkp_SOURCES = gpgkeys_hkp.c ksutil.c ksutil.h | ||
60 | gpgkeys_finger_SOURCES = gpgkeys_finger.c ksutil.c ksutil.h | ||
61 | gpgkeys_curl_SOURCES = gpgkeys_curl.c ksutil.c ksutil.h | ||
62 | |||
63 | -other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS) | ||
64 | +other_libs = $(LIBINTL) $(CAPLIBS) | ||
65 | |||
66 | gpgkeys_ldap_CPPFLAGS = @LDAP_CPPFLAGS@ | ||
67 | gpgkeys_ldap_LDADD = ../util/libcompat.a @LDAPLIBS@ @NETLIBS@ $(other_libs) @GETOPT@ @W32LIBS@ | ||
68 | diff --git a/tools/Makefile.am b/tools/Makefile.am | ||
69 | index 8a9c035..22cdb1e 100644 | ||
70 | --- a/tools/Makefile.am | ||
71 | +++ b/tools/Makefile.am | ||
72 | @@ -28,7 +28,7 @@ AM_CPPFLAGS += -DLOCALEDIR="\"$(localedir)\"" | ||
73 | endif | ||
74 | |||
75 | needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a | ||
76 | -other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS) | ||
77 | +other_libs = $(LIBINTL) $(CAPLIBS) | ||
78 | |||
79 | |||
80 | bin_PROGRAMS = gpgsplit | ||
diff --git a/recipes-support/gnupg/gnupg_1.4.7.bb b/recipes-support/gnupg/gnupg_1.4.7.bb index a7fbd11..6a950fd 100644 --- a/recipes-support/gnupg/gnupg_1.4.7.bb +++ b/recipes-support/gnupg/gnupg_1.4.7.bb | |||
@@ -19,7 +19,8 @@ SRC_URI = "${GNUPG_MIRROR}/gnupg/gnupg-${PV}.tar.bz2 \ | |||
19 | file://CVE-2013-4576.patch \ | 19 | file://CVE-2013-4576.patch \ |
20 | file://CVE-2013-4242.patch \ | 20 | file://CVE-2013-4242.patch \ |
21 | file://fix-ustar-check-issue.patch \ | 21 | file://fix-ustar-check-issue.patch \ |
22 | " | 22 | file://0001-Make-it-build-with-gettext-0.20.patch \ |
23 | " | ||
23 | 24 | ||
24 | SRC_URI[md5sum] = "b06a141cca5cd1a55bbdd25ab833303c" | 25 | SRC_URI[md5sum] = "b06a141cca5cd1a55bbdd25ab833303c" |
25 | SRC_URI[sha256sum] = "69d18b7d193f62ca27ed4febcb4c9044aa0c95305d3258fe902e2fae5fc6468d" | 26 | SRC_URI[sha256sum] = "69d18b7d193f62ca27ed4febcb4c9044aa0c95305d3258fe902e2fae5fc6468d" |