summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorTrevor Gamblin <trevor.gamblin@windriver.com>2019-10-29 12:29:47 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-04 13:39:05 +0000
commitb8f8707dfe1ba2c98871b42a1a2d28d14b0f67a8 (patch)
tree206cf6ce2de14a5c341d3d9a0cbc91100f7156a5 /meta
parent421b8d43abaed391d7ce18a34bf6f310f9126b2e (diff)
downloadpoky-b8f8707dfe1ba2c98871b42a1a2d28d14b0f67a8.tar.gz
libgcrypt: upgrade 1.8.4 -> 1.8.5
Upgrade libgcrypt. Upstream repo now has a pkg-config feature. The new patch for compatibility with oe-core is a replacement for a patch that added pkg-config as a feature when upstream did not have it. (From OE-Core rev: 53b73a39ae4a4c8db19fb18ef1881033f6b9ff51) Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch (renamed from meta/recipes-support/libgcrypt/files/0001-Add-and-use-pkg-config-for-libgcrypt-instead-of-conf.patch)138
-rw-r--r--meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb (renamed from meta/recipes-support/libgcrypt/libgcrypt_1.8.4.bb)6
2 files changed, 55 insertions, 89 deletions
diff --git a/meta/recipes-support/libgcrypt/files/0001-Add-and-use-pkg-config-for-libgcrypt-instead-of-conf.patch b/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch
index d41c3de3b6..cd8a5993b4 100644
--- a/meta/recipes-support/libgcrypt/files/0001-Add-and-use-pkg-config-for-libgcrypt-instead-of-conf.patch
+++ b/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch
@@ -1,41 +1,26 @@
1From 72b9e9040d58c15f0302bd8abda28179f04e1c5f Mon Sep 17 00:00:00 2001 1From bee26d7c4ea0b4a397c289b819b89e78bc325ba0 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org> 2From: Trevor Gamblin <trevor.gamblin@windriver.com>
3Date: Wed, 16 Aug 2017 10:43:18 +0800 3Date: Tue, 29 Oct 2019 14:08:32 -0400
4Subject: [PATCH 1/4] Add and use pkg-config for libgcrypt instead of -config 4Subject: [PATCH] libgcrypt: fix m4 file for oe-core
5 scripts.
6 5
7Upstream-Status: Denied [upstream have indicated they don't want a 6Modify libgcrypt pkgconfig specifically for oe-core. Changes
8pkg-config dependency] 7are based on a previous patch from RP, using wiggle to
8incorporate the parts that aren't in the upstream pkgconfig
9settings.
9 10
10RP 2014/5/22 11Upstream-Status: Inappropriate [oe-specific]
11 12
12Rebase to 1.8.0 13Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
13 14
14Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15--- 15---
16 configure.ac | 1 + 16 src/libgcrypt.m4 | 90 +++---------------------------------------------
17 src/libgcrypt.m4 | 71 +++-------------------------------------------------- 17 1 file changed, 4 insertions(+), 86 deletions(-)
18 src/libgcrypt.pc.in | 33 +++++++++++++++++++++++++
19 3 files changed, 38 insertions(+), 67 deletions(-)
20 create mode 100644 src/libgcrypt.pc.in
21 18
22diff --git a/configure.ac b/configure.ac
23index bbe8104..3d2de73 100644
24--- a/configure.ac
25+++ b/configure.ac
26@@ -2607,6 +2607,7 @@ random/Makefile
27 doc/Makefile
28 src/Makefile
29 src/gcrypt.h
30+src/libgcrypt.pc
31 src/libgcrypt-config
32 src/versioninfo.rc
33 tests/Makefile
34diff --git a/src/libgcrypt.m4 b/src/libgcrypt.m4 19diff --git a/src/libgcrypt.m4 b/src/libgcrypt.m4
35index c67cfec..4ea5f2c 100644 20index 37dfbea2..3d2e90a8 100644
36--- a/src/libgcrypt.m4 21--- a/src/libgcrypt.m4
37+++ b/src/libgcrypt.m4 22+++ b/src/libgcrypt.m4
38@@ -29,30 +29,6 @@ dnl is added to the gpg_config_script_warn variable. 23@@ -29,41 +29,6 @@ dnl is added to the gpg_config_script_warn variable.
39 dnl 24 dnl
40 AC_DEFUN([AM_PATH_LIBGCRYPT], 25 AC_DEFUN([AM_PATH_LIBGCRYPT],
41 [ AC_REQUIRE([AC_CANONICAL_HOST]) 26 [ AC_REQUIRE([AC_CANONICAL_HOST])
@@ -46,8 +31,20 @@ index c67cfec..4ea5f2c 100644
46- if test x"${LIBGCRYPT_CONFIG}" = x ; then 31- if test x"${LIBGCRYPT_CONFIG}" = x ; then
47- if test x"${libgcrypt_config_prefix}" != x ; then 32- if test x"${libgcrypt_config_prefix}" != x ; then
48- LIBGCRYPT_CONFIG="${libgcrypt_config_prefix}/bin/libgcrypt-config" 33- LIBGCRYPT_CONFIG="${libgcrypt_config_prefix}/bin/libgcrypt-config"
49- else 34- fi
50- case "${SYSROOT}" in 35- fi
36-
37- use_gpgrt_config=""
38- if test x"${LIBGCRYPT_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
39- if $GPGRT_CONFIG libgcrypt --exists; then
40- LIBGCRYPT_CONFIG="$GPGRT_CONFIG libgcrypt"
41- AC_MSG_NOTICE([Use gpgrt-config as libgcrypt-config])
42- use_gpgrt_config=yes
43- fi
44- fi
45- if test -z "$use_gpgrt_config"; then
46- if test x"${LIBGCRYPT_CONFIG}" = x ; then
47- case "${SYSROOT}" in
51- /*) 48- /*)
52- if test -x "${SYSROOT}/bin/libgcrypt-config" ; then 49- if test -x "${SYSROOT}/bin/libgcrypt-config" ; then
53- LIBGCRYPT_CONFIG="${SYSROOT}/bin/libgcrypt-config" 50- LIBGCRYPT_CONFIG="${SYSROOT}/bin/libgcrypt-config"
@@ -58,15 +55,14 @@ index c67cfec..4ea5f2c 100644
58- *) 55- *)
59- AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.]) 56- AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
60- ;; 57- ;;
61- esac 58- esac
62- fi 59- fi
60- AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
63- fi 61- fi
64- 62
65- AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
66 tmp=ifelse([$1], ,1:1.2.0,$1) 63 tmp=ifelse([$1], ,1:1.2.0,$1)
67 if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then 64 if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
68 req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` 65@@ -74,56 +39,13 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
69@@ -62,48 +38,13 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
70 min_libgcrypt_version="$tmp" 66 min_libgcrypt_version="$tmp"
71 fi 67 fi
72 68
@@ -79,7 +75,11 @@ index c67cfec..4ea5f2c 100644
79- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` 75- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
80- req_micro=`echo $min_libgcrypt_version | \ 76- req_micro=`echo $min_libgcrypt_version | \
81- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` 77- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
82- libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` 78- if test -z "$use_gpgrt_config"; then
79- libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
80- else
81- libgcrypt_config_version=`$LIBGCRYPT_CONFIG --modversion`
82- fi
83- major=`echo $libgcrypt_config_version | \ 83- major=`echo $libgcrypt_config_version | \
84- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` 84- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
85- minor=`echo $libgcrypt_config_version | \ 85- minor=`echo $libgcrypt_config_version | \
@@ -113,24 +113,29 @@ index c67cfec..4ea5f2c 100644
113 # If we have a recent libgcrypt, we should also check that the 113 # If we have a recent libgcrypt, we should also check that the
114 # API is compatible 114 # API is compatible
115 if test "$req_libgcrypt_api" -gt 0 ; then 115 if test "$req_libgcrypt_api" -gt 0 ; then
116- tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` 116- if test -z "$use_gpgrt_config"; then
117- tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
118- else
119- tmp=`$LIBGCRYPT_CONFIG --variable=api_version 2>/dev/null || echo 0`
120- fi
117+ tmp=`$PKG_CONFIG --variable=api_version libgcrypt` 121+ tmp=`$PKG_CONFIG --variable=api_version libgcrypt`
118 if test "$tmp" -gt 0 ; then 122 if test "$tmp" -gt 0 ; then
119 AC_MSG_CHECKING([LIBGCRYPT API version]) 123 AC_MSG_CHECKING([LIBGCRYPT API version])
120 if test "$req_libgcrypt_api" -eq "$tmp" ; then 124 if test "$req_libgcrypt_api" -eq "$tmp" ; then
121@@ -116,10 +57,8 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], 125@@ -136,11 +58,9 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
122 fi 126 fi
123 fi 127 fi
124 if test $ok = yes; then 128 if test $ok = yes; then
125- LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` 129- LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
126- LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` 130- LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
127 ifelse([$2], , :, [$2]) 131 ifelse([$2], , :, [$2])
128- libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none` 132 if test -z "$use_gpgrt_config"; then
129+ libgcrypt_config_host=`$PKG_CONFIG --variable=host libgcrypt` 133- libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
130 if test x"$libgcrypt_config_host" != xnone ; then 134+ libgcrypt_config_host=`$PKG_CONFIG --variable=host libgcrypt`
131 if test x"$libgcrypt_config_host" != x"$host" ; then 135 else
132 AC_MSG_WARN([[ 136 libgcrypt_config_host=`$LIBGCRYPT_CONFIG --variable=host 2>/dev/null || echo none`
133@@ -134,8 +73,6 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], 137 fi
138@@ -158,8 +78,6 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
134 fi 139 fi
135 fi 140 fi
136 else 141 else
@@ -139,45 +144,6 @@ index c67cfec..4ea5f2c 100644
139 ifelse([$3], , :, [$3]) 144 ifelse([$3], , :, [$3])
140 fi 145 fi
141 AC_SUBST(LIBGCRYPT_CFLAGS) 146 AC_SUBST(LIBGCRYPT_CFLAGS)
142diff --git a/src/libgcrypt.pc.in b/src/libgcrypt.pc.in
143new file mode 100644
144index 0000000..2fc8f53
145--- /dev/null
146+++ b/src/libgcrypt.pc.in
147@@ -0,0 +1,33 @@
148+# Process this file with autoconf to produce a pkg-config metadata file.
149+# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation
150+# Author: Simon Josefsson
151+#
152+# This file is free software; as a special exception the author gives
153+# unlimited permission to copy and/or distribute it, with or without
154+# modifications, as long as this notice is preserved.
155+#
156+# This file is distributed in the hope that it will be useful, but
157+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
158+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
159+
160+prefix=@prefix@
161+exec_prefix=@exec_prefix@
162+libdir=@libdir@
163+includedir=@includedir@
164+
165+# API info
166+api_version=@LIBGCRYPT_CONFIG_API_VERSION@
167+host=@LIBGCRYPT_CONFIG_HOST@
168+
169+# Misc information.
170+symmetric_ciphers=@LIBGCRYPT_CIPHERS@
171+asymmetric_ciphers=@LIBGCRYPT_PUBKEY_CIPHERS@
172+digests=@LIBGCRYPT_DIGESTS@
173+
174+Name: libgcrypt
175+Description: GNU crypto library
176+URL: http://www.gnupg.org
177+Version: @VERSION@
178+Libs: -L${libdir} -lgcrypt
179+Libs.private: -L${libdir} -lgpg-error
180+Cflags: -I${includedir}
181-- 147--
1821.8.3.1 1482.17.1
183 149
diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.8.4.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb
index 11d078d44a..04785574f2 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt_1.8.4.bb
+++ b/meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb
@@ -17,7 +17,7 @@ DEPENDS = "libgpg-error"
17 17
18UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" 18UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
19SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \ 19SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \
20 file://0001-Add-and-use-pkg-config-for-libgcrypt-instead-of-conf.patch \ 20 file://0001-libgcrypt-fix-m4-file-for-oe-core.patch \
21 file://0003-tests-bench-slope.c-workaround-ICE-failure-on-mips-w.patch \ 21 file://0003-tests-bench-slope.c-workaround-ICE-failure-on-mips-w.patch \
22 file://0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \ 22 file://0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \
23 file://0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch \ 23 file://0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch \
@@ -25,8 +25,8 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \
25 file://0002-AES-move-look-up-tables-to-.data-section-and-unshare.patch \ 25 file://0002-AES-move-look-up-tables-to-.data-section-and-unshare.patch \
26 file://0003-GCM-move-look-up-table-to-.data-section-and-unshare-.patch \ 26 file://0003-GCM-move-look-up-table-to-.data-section-and-unshare-.patch \
27" 27"
28SRC_URI[md5sum] = "fbfdaebbbc6d7e5fbbf6ffdb3e139573" 28SRC_URI[md5sum] = "348cc4601ca34307fc6cd6c945467743"
29SRC_URI[sha256sum] = "f638143a0672628fde0cad745e9b14deb85dffb175709cacc1f4fe24b93f2227" 29SRC_URI[sha256sum] = "3b4a2a94cb637eff5bdebbcaf46f4d95c4f25206f459809339cdada0eb577ac3"
30 30
31BINCONFIG = "${bindir}/libgcrypt-config" 31BINCONFIG = "${bindir}/libgcrypt-config"
32 32