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