summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/libgcrypt/files/add-pkgconfig-support.patch140
-rw-r--r--meta/recipes-support/libgcrypt/files/fix-undefined-reference-to-pthread.patch27
-rw-r--r--meta/recipes-support/libgcrypt/libgcrypt.inc1
-rw-r--r--meta/recipes-support/libgcrypt/libgcrypt_1.6.5.bb4
-rw-r--r--meta/recipes-support/libgcrypt/libgcrypt_1.7.0.bb4
5 files changed, 115 insertions, 61 deletions
diff --git a/meta/recipes-support/libgcrypt/files/add-pkgconfig-support.patch b/meta/recipes-support/libgcrypt/files/add-pkgconfig-support.patch
index 67ddfc6403..69589f5482 100644
--- a/meta/recipes-support/libgcrypt/files/add-pkgconfig-support.patch
+++ b/meta/recipes-support/libgcrypt/files/add-pkgconfig-support.patch
@@ -4,61 +4,32 @@ Upstream-Status: Denied [upstream have indicated they don't want a pkg-config de
4 4
5RP 2014/5/22 5RP 2014/5/22
6 6
7Index: libgcrypt-1.2.4/configure.ac 7Rebase to 1.7.0
8=================================================================== 8Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
9--- libgcrypt-1.2.4.orig/configure.ac 2008-03-19 22:14:50.000000000 +0000 9---
10+++ libgcrypt-1.2.4/configure.ac 2008-03-19 22:14:58.000000000 +0000 10 configure.ac | 1 +
11@@ -807,6 +807,7 @@ 11 src/libgcrypt.m4 | 71 +++--------------------------------------------------
12 src/libgcrypt.pc.in | 33 +++++++++++++++++++++++++
13 3 files changed, 38 insertions(+), 67 deletions(-)
14 create mode 100644 src/libgcrypt.pc.in
15
16diff --git a/configure.ac b/configure.ac
17index f683e21..566e1c8 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -2314,6 +2314,7 @@ random/Makefile
12 doc/Makefile 21 doc/Makefile
13 src/Makefile 22 src/Makefile
14 src/gcrypt.h 23 src/gcrypt.h
15+src/libgcrypt.pc 24+src/libgcrypt.pc
16 src/libgcrypt-config 25 src/libgcrypt-config
26 src/versioninfo.rc
17 tests/Makefile 27 tests/Makefile
18 w32-dll/Makefile 28diff --git a/src/libgcrypt.m4 b/src/libgcrypt.m4
19Index: libgcrypt-1.2.4/src/libgcrypt.pc.in 29index c67cfec..4ea5f2c 100644
20=================================================================== 30--- a/src/libgcrypt.m4
21--- /dev/null 1970-01-01 00:00:00.000000000 +0000 31+++ b/src/libgcrypt.m4
22+++ libgcrypt-1.2.4/src/libgcrypt.pc.in 2008-03-19 22:14:58.000000000 +0000 32@@ -29,30 +29,6 @@ dnl is added to the gpg_config_script_warn variable.
23@@ -0,0 +1,33 @@
24+# Process this file with autoconf to produce a pkg-config metadata file.
25+# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation
26+# Author: Simon Josefsson
27+#
28+# This file is free software; as a special exception the author gives
29+# unlimited permission to copy and/or distribute it, with or without
30+# modifications, as long as this notice is preserved.
31+#
32+# This file is distributed in the hope that it will be useful, but
33+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
34+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
35+
36+prefix=@prefix@
37+exec_prefix=@exec_prefix@
38+libdir=@libdir@
39+includedir=@includedir@
40+
41+# API info
42+api_version=@LIBGCRYPT_CONFIG_API_VERSION@
43+host=@LIBGCRYPT_CONFIG_HOST@
44+
45+# Misc information.
46+symmetric_ciphers=@LIBGCRYPT_CIPHERS@
47+asymmetric_ciphers=@LIBGCRYPT_PUBKEY_CIPHERS@
48+digests=@LIBGCRYPT_DIGESTS@
49+
50+Name: libgcrypt
51+Description: GNU crypto library
52+URL: http://www.gnupg.org
53+Version: @VERSION@
54+Libs: -L${libdir} -lgcrypt
55+Libs.private: -L${libdir} -lgpg-error
56+Cflags: -I${includedir}
57Index: libgcrypt-1.6.1/src/libgcrypt.m4
58===================================================================
59--- libgcrypt-1.6.1.orig/src/libgcrypt.m4 2013-12-16 17:44:32.000000000 +0000
60+++ libgcrypt-1.6.1/src/libgcrypt.m4 2014-05-13 21:25:37.478389833 +0000
61@@ -22,17 +22,7 @@
62 dnl 33 dnl
63 AC_DEFUN([AM_PATH_LIBGCRYPT], 34 AC_DEFUN([AM_PATH_LIBGCRYPT],
64 [ AC_REQUIRE([AC_CANONICAL_HOST]) 35 [ AC_REQUIRE([AC_CANONICAL_HOST])
@@ -66,17 +37,30 @@ Index: libgcrypt-1.6.1/src/libgcrypt.m4
66- AC_HELP_STRING([--with-libgcrypt-prefix=PFX], 37- AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
67- [prefix where LIBGCRYPT is installed (optional)]), 38- [prefix where LIBGCRYPT is installed (optional)]),
68- libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") 39- libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
69- if test x$libgcrypt_config_prefix != x ; then 40- if test x"${LIBGCRYPT_CONFIG}" = x ; then
70- if test x${LIBGCRYPT_CONFIG+set} != xset ; then 41- if test x"${libgcrypt_config_prefix}" != x ; then
71- LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config 42- LIBGCRYPT_CONFIG="${libgcrypt_config_prefix}/bin/libgcrypt-config"
43- else
44- case "${SYSROOT}" in
45- /*)
46- if test -x "${SYSROOT}/bin/libgcrypt-config" ; then
47- LIBGCRYPT_CONFIG="${SYSROOT}/bin/libgcrypt-config"
48- fi
49- ;;
50- '')
51- ;;
52- *)
53- AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
54- ;;
55- esac
72- fi 56- fi
73- fi 57- fi
74 58-
75- AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no) 59- AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
76 tmp=ifelse([$1], ,1:1.2.0,$1) 60 tmp=ifelse([$1], ,1:1.2.0,$1)
77 if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then 61 if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
78 req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` 62 req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
79@@ -42,48 +32,13 @@ 63@@ -62,48 +38,13 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
80 min_libgcrypt_version="$tmp" 64 min_libgcrypt_version="$tmp"
81 fi 65 fi
82 66
@@ -128,7 +112,7 @@ Index: libgcrypt-1.6.1/src/libgcrypt.m4
128 if test "$tmp" -gt 0 ; then 112 if test "$tmp" -gt 0 ; then
129 AC_MSG_CHECKING([LIBGCRYPT API version]) 113 AC_MSG_CHECKING([LIBGCRYPT API version])
130 if test "$req_libgcrypt_api" -eq "$tmp" ; then 114 if test "$req_libgcrypt_api" -eq "$tmp" ; then
131@@ -96,10 +51,8 @@ 115@@ -116,10 +57,8 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
132 fi 116 fi
133 fi 117 fi
134 if test $ok = yes; then 118 if test $ok = yes; then
@@ -140,7 +124,7 @@ Index: libgcrypt-1.6.1/src/libgcrypt.m4
140 if test x"$libgcrypt_config_host" != xnone ; then 124 if test x"$libgcrypt_config_host" != xnone ; then
141 if test x"$libgcrypt_config_host" != x"$host" ; then 125 if test x"$libgcrypt_config_host" != x"$host" ; then
142 AC_MSG_WARN([[ 126 AC_MSG_WARN([[
143@@ -113,8 +66,6 @@ 127@@ -134,8 +73,6 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
144 fi 128 fi
145 fi 129 fi
146 else 130 else
@@ -149,3 +133,45 @@ Index: libgcrypt-1.6.1/src/libgcrypt.m4
149 ifelse([$3], , :, [$3]) 133 ifelse([$3], , :, [$3])
150 fi 134 fi
151 AC_SUBST(LIBGCRYPT_CFLAGS) 135 AC_SUBST(LIBGCRYPT_CFLAGS)
136diff --git a/src/libgcrypt.pc.in b/src/libgcrypt.pc.in
137new file mode 100644
138index 0000000..2fc8f53
139--- /dev/null
140+++ b/src/libgcrypt.pc.in
141@@ -0,0 +1,33 @@
142+# Process this file with autoconf to produce a pkg-config metadata file.
143+# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation
144+# Author: Simon Josefsson
145+#
146+# This file is free software; as a special exception the author gives
147+# unlimited permission to copy and/or distribute it, with or without
148+# modifications, as long as this notice is preserved.
149+#
150+# This file is distributed in the hope that it will be useful, but
151+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
152+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
153+
154+prefix=@prefix@
155+exec_prefix=@exec_prefix@
156+libdir=@libdir@
157+includedir=@includedir@
158+
159+# API info
160+api_version=@LIBGCRYPT_CONFIG_API_VERSION@
161+host=@LIBGCRYPT_CONFIG_HOST@
162+
163+# Misc information.
164+symmetric_ciphers=@LIBGCRYPT_CIPHERS@
165+asymmetric_ciphers=@LIBGCRYPT_PUBKEY_CIPHERS@
166+digests=@LIBGCRYPT_DIGESTS@
167+
168+Name: libgcrypt
169+Description: GNU crypto library
170+URL: http://www.gnupg.org
171+Version: @VERSION@
172+Libs: -L${libdir} -lgcrypt
173+Libs.private: -L${libdir} -lgpg-error
174+Cflags: -I${includedir}
175--
1762.8.1
177
diff --git a/meta/recipes-support/libgcrypt/files/fix-undefined-reference-to-pthread.patch b/meta/recipes-support/libgcrypt/files/fix-undefined-reference-to-pthread.patch
new file mode 100644
index 0000000000..e7de8badf8
--- /dev/null
+++ b/meta/recipes-support/libgcrypt/files/fix-undefined-reference-to-pthread.patch
@@ -0,0 +1,27 @@
1From cc0e2b403d33892963513a3ba98e4ae5a05a4d3c Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Sun, 12 Jun 2016 04:44:29 -0400
4Subject: [PATCH] tests/Makefile.am: fix undefined reference to `pthread_create'
5
6Add missing '-lpthread' to CFLAGS
7
8Upstream-Status: Pending
9
10Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
11---
12 tests/Makefile.am | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/tests/Makefile.am b/tests/Makefile.am
16index d462f30..bef6dd7 100644
17--- a/tests/Makefile.am
18+++ b/tests/Makefile.am
19@@ -62,4 +62,4 @@ EXTRA_DIST = README rsa-16k.key cavs_tests.sh cavs_driver.pl \
20
21 LDADD = $(standard_ldadd) $(GPG_ERROR_LIBS)
22 t_lock_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS)
23-t_lock_CFLAGS = $(GPG_ERROR_MT_CFLAGS)
24+t_lock_CFLAGS = $(GPG_ERROR_MT_CFLAGS) -lpthread
25--
262.8.1
27
diff --git a/meta/recipes-support/libgcrypt/libgcrypt.inc b/meta/recipes-support/libgcrypt/libgcrypt.inc
index a4f3cd0f00..15805cd436 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt.inc
+++ b/meta/recipes-support/libgcrypt/libgcrypt.inc
@@ -19,6 +19,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.gz \
19 file://add-pkgconfig-support.patch \ 19 file://add-pkgconfig-support.patch \
20 file://libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \ 20 file://libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \
21 file://fix-ICE-failure-on-mips-with-option-O-and-g.patch \ 21 file://fix-ICE-failure-on-mips-with-option-O-and-g.patch \
22 file://fix-undefined-reference-to-pthread.patch \
22" 23"
23 24
24BINCONFIG = "${bindir}/libgcrypt-config" 25BINCONFIG = "${bindir}/libgcrypt-config"
diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.6.5.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.6.5.bb
deleted file mode 100644
index 717a23f1c4..0000000000
--- a/meta/recipes-support/libgcrypt/libgcrypt_1.6.5.bb
+++ /dev/null
@@ -1,4 +0,0 @@
1require libgcrypt.inc
2
3SRC_URI[md5sum] = "f24fcb684932d4b5ed85f2f05cb1d9f8"
4SRC_URI[sha256sum] = "202bf109ccf2d614565c849f3e5687b94cde972167b35261e094252367627bc6"
diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.7.0.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.7.0.bb
new file mode 100644
index 0000000000..37637f69d8
--- /dev/null
+++ b/meta/recipes-support/libgcrypt/libgcrypt_1.7.0.bb
@@ -0,0 +1,4 @@
1require libgcrypt.inc
2
3SRC_URI[md5sum] = "0a4d2d94b69832c780599f38280b2450"
4SRC_URI[sha256sum] = "07f88053ac9f7cfd35c2d404954b1e370818b757fd202ef2a5d4f398c11b7b06"