summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libksba
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/libksba')
-rw-r--r--meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch18
-rw-r--r--meta/recipes-support/libksba/libksba_1.5.0.bb (renamed from meta/recipes-support/libksba/libksba_1.4.0.bb)2
2 files changed, 12 insertions, 8 deletions
diff --git a/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch b/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch
index ebb7fa588a..af96bd57cd 100644
--- a/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch
+++ b/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch
@@ -1,4 +1,4 @@
1From 7bd2b060e9ea3e2ff11e67d1e98ab882819b28b7 Mon Sep 17 00:00:00 2001 1From 6081640895b6d566fa21123e2de7d111eeab5c4c Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Mon, 3 Dec 2012 18:17:31 +0800 3Date: Mon, 3 Dec 2012 18:17:31 +0800
4Subject: [PATCH] libksba: add pkgconfig support 4Subject: [PATCH] libksba: add pkgconfig support
@@ -11,11 +11,15 @@ They think pkgconfig adds no portability and maintaining them is not worthwhile.
11 11
12Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 12Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
13 13
14---
15 src/ksba.m4 | 90 +++--------------------------------------------------
16 1 file changed, 4 insertions(+), 86 deletions(-)
17
14diff --git a/src/ksba.m4 b/src/ksba.m4 18diff --git a/src/ksba.m4 b/src/ksba.m4
15index ad8de4f..af903ad 100644 19index 6b55bb8..6e7336f 100644
16--- a/src/ksba.m4 20--- a/src/ksba.m4
17+++ b/src/ksba.m4 21+++ b/src/ksba.m4
18@@ -22,37 +22,6 @@ dnl with a changed API. 22@@ -23,37 +23,6 @@ dnl with a changed API.
19 dnl 23 dnl
20 AC_DEFUN([AM_PATH_KSBA], 24 AC_DEFUN([AM_PATH_KSBA],
21 [ AC_REQUIRE([AC_CANONICAL_HOST]) 25 [ AC_REQUIRE([AC_CANONICAL_HOST])
@@ -23,7 +27,7 @@ index ad8de4f..af903ad 100644
23- dnl since that is consistent with how our three siblings use the directory/ 27- dnl since that is consistent with how our three siblings use the directory/
24- dnl package name in --with-$dir_name-prefix=PFX. 28- dnl package name in --with-$dir_name-prefix=PFX.
25- AC_ARG_WITH(libksba-prefix, 29- AC_ARG_WITH(libksba-prefix,
26- AC_HELP_STRING([--with-libksba-prefix=PFX], 30- AS_HELP_STRING([--with-libksba-prefix=PFX],
27- [prefix where KSBA is installed (optional)]), 31- [prefix where KSBA is installed (optional)]),
28- ksba_config_prefix="$withval", ksba_config_prefix="") 32- ksba_config_prefix="$withval", ksba_config_prefix="")
29- 33-
@@ -53,7 +57,7 @@ index ad8de4f..af903ad 100644
53 57
54 tmp=ifelse([$1], ,1:1.0.0,$1) 58 tmp=ifelse([$1], ,1:1.0.0,$1)
55 if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then 59 if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
56@@ -63,56 +32,13 @@ AC_DEFUN([AM_PATH_KSBA], 60@@ -64,56 +33,13 @@ AC_DEFUN([AM_PATH_KSBA],
57 min_ksba_version="$tmp" 61 min_ksba_version="$tmp"
58 fi 62 fi
59 63
@@ -113,7 +117,7 @@ index ad8de4f..af903ad 100644
113 if test "$tmp" -gt 0 ; then 117 if test "$tmp" -gt 0 ; then
114 AC_MSG_CHECKING([KSBA API version]) 118 AC_MSG_CHECKING([KSBA API version])
115 if test "$req_ksba_api" -eq "$tmp" ; then 119 if test "$req_ksba_api" -eq "$tmp" ; then
116@@ -125,14 +51,8 @@ AC_DEFUN([AM_PATH_KSBA], 120@@ -126,14 +52,8 @@ AC_DEFUN([AM_PATH_KSBA],
117 fi 121 fi
118 fi 122 fi
119 if test $ok = yes; then 123 if test $ok = yes; then
@@ -129,7 +133,7 @@ index ad8de4f..af903ad 100644
129 if test x"$libksba_config_host" != xnone ; then 133 if test x"$libksba_config_host" != xnone ; then
130 if test x"$libksba_config_host" != x"$host" ; then 134 if test x"$libksba_config_host" != x"$host" ; then
131 AC_MSG_WARN([[ 135 AC_MSG_WARN([[
132@@ -146,8 +66,6 @@ AC_DEFUN([AM_PATH_KSBA], 136@@ -147,8 +67,6 @@ AC_DEFUN([AM_PATH_KSBA],
133 fi 137 fi
134 fi 138 fi
135 else 139 else
diff --git a/meta/recipes-support/libksba/libksba_1.4.0.bb b/meta/recipes-support/libksba/libksba_1.5.0.bb
index a9daf22d77..005389eab6 100644
--- a/meta/recipes-support/libksba/libksba_1.4.0.bb
+++ b/meta/recipes-support/libksba/libksba_1.5.0.bb
@@ -19,7 +19,7 @@ UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
19SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ 19SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
20 file://ksba-add-pkgconfig-support.patch" 20 file://ksba-add-pkgconfig-support.patch"
21 21
22SRC_URI[sha256sum] = "bfe6a8e91ff0f54d8a329514db406667000cb207238eded49b599761bfca41b6" 22SRC_URI[sha256sum] = "ae4af129216b2d7fdea0b5bf2a788cd458a79c983bb09a43f4d525cc87aba0ba"
23 23
24do_configure_prepend () { 24do_configure_prepend () {
25 # Else these could be used in preference to those in aclocal-copy 25 # Else these could be used in preference to those in aclocal-copy