diff options
Diffstat (limited to 'meta/recipes-support/libassuan')
-rw-r--r-- | meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch | 27 | ||||
-rw-r--r-- | meta/recipes-support/libassuan/libassuan_2.5.7.bb (renamed from meta/recipes-support/libassuan/libassuan_2.5.4.bb) | 15 |
2 files changed, 26 insertions, 16 deletions
diff --git a/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch b/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch index 0e81454c63..fe811254d3 100644 --- a/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch +++ b/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch | |||
@@ -8,17 +8,20 @@ Signed-off-by: Constantin Musca <constantinx.musca@intel.com> | |||
8 | 8 | ||
9 | forward ported to 2.4.4 | 9 | forward ported to 2.4.4 |
10 | Signed-off-by: Armin Kuster <akuster@mvista.com> | 10 | Signed-off-by: Armin Kuster <akuster@mvista.com> |
11 | --- | ||
12 | src/libassuan.m4 | 81 ++---------------------------------------------- | ||
13 | 1 file changed, 3 insertions(+), 78 deletions(-) | ||
11 | 14 | ||
12 | Index: libassuan-2.5.2/src/libassuan.m4 | 15 | diff --git a/src/libassuan.m4 b/src/libassuan.m4 |
13 | =================================================================== | 16 | index df50484..380a48a 100644 |
14 | --- libassuan-2.5.2.orig/src/libassuan.m4 | 17 | --- a/src/libassuan.m4 |
15 | +++ libassuan-2.5.2/src/libassuan.m4 | 18 | +++ b/src/libassuan.m4 |
16 | @@ -16,27 +16,6 @@ dnl Returns ok set to yes or no. | 19 | @@ -17,27 +17,6 @@ dnl Returns ok set to yes or no. |
17 | dnl | 20 | dnl |
18 | AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], | 21 | AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], |
19 | [ AC_REQUIRE([AC_CANONICAL_HOST]) | 22 | [ AC_REQUIRE([AC_CANONICAL_HOST]) |
20 | - AC_ARG_WITH(libassuan-prefix, | 23 | - AC_ARG_WITH(libassuan-prefix, |
21 | - AC_HELP_STRING([--with-libassuan-prefix=PFX], | 24 | - AS_HELP_STRING([--with-libassuan-prefix=PFX], |
22 | - [prefix where LIBASSUAN is installed (optional)]), | 25 | - [prefix where LIBASSUAN is installed (optional)]), |
23 | - libassuan_config_prefix="$withval", libassuan_config_prefix="") | 26 | - libassuan_config_prefix="$withval", libassuan_config_prefix="") |
24 | - if test x$libassuan_config_prefix != x ; then | 27 | - if test x$libassuan_config_prefix != x ; then |
@@ -41,10 +44,11 @@ Index: libassuan-2.5.2/src/libassuan.m4 | |||
41 | 44 | ||
42 | tmp=ifelse([$1], ,1:0.9.2,$1) | 45 | tmp=ifelse([$1], ,1:0.9.2,$1) |
43 | if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then | 46 | if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then |
44 | @@ -47,58 +26,11 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], | 47 | @@ -47,59 +26,11 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], |
48 | req_libassuan_api=0 | ||
45 | min_libassuan_version="$tmp" | 49 | min_libassuan_version="$tmp" |
46 | fi | 50 | fi |
47 | 51 | - | |
48 | - AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version) | 52 | - AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version) |
49 | - ok=no | 53 | - ok=no |
50 | - if test "$LIBASSUAN_CONFIG" != "no"; then | 54 | - if test "$LIBASSUAN_CONFIG" != "no"; then |
@@ -102,7 +106,7 @@ Index: libassuan-2.5.2/src/libassuan.m4 | |||
102 | if test "$tmp" -gt 0 ; then | 106 | if test "$tmp" -gt 0 ; then |
103 | AC_MSG_CHECKING([LIBASSUAN API version]) | 107 | AC_MSG_CHECKING([LIBASSUAN API version]) |
104 | if test "$req_libassuan_api" -eq "$tmp" ; then | 108 | if test "$req_libassuan_api" -eq "$tmp" ; then |
105 | @@ -114,9 +46,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], | 109 | @@ -115,9 +46,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], |
106 | if test $ok = yes; then | 110 | if test $ok = yes; then |
107 | if test x"$host" != x ; then | 111 | if test x"$host" != x ; then |
108 | if test -z "$use_gpgrt_config"; then | 112 | if test -z "$use_gpgrt_config"; then |
@@ -113,7 +117,7 @@ Index: libassuan-2.5.2/src/libassuan.m4 | |||
113 | fi | 117 | fi |
114 | if test x"$libassuan_config_host" != xnone ; then | 118 | if test x"$libassuan_config_host" != xnone ; then |
115 | if test x"$libassuan_config_host" != x"$host" ; then | 119 | if test x"$libassuan_config_host" != x"$host" ; then |
116 | @@ -158,12 +88,8 @@ dnl | 120 | @@ -159,12 +88,8 @@ dnl |
117 | AC_DEFUN([AM_PATH_LIBASSUAN], | 121 | AC_DEFUN([AM_PATH_LIBASSUAN], |
118 | [ _AM_PATH_LIBASSUAN_COMMON($1) | 122 | [ _AM_PATH_LIBASSUAN_COMMON($1) |
119 | if test $ok = yes; then | 123 | if test $ok = yes; then |
@@ -126,3 +130,6 @@ Index: libassuan-2.5.2/src/libassuan.m4 | |||
126 | ifelse([$3], , :, [$3]) | 130 | ifelse([$3], , :, [$3]) |
127 | fi | 131 | fi |
128 | AC_SUBST(LIBASSUAN_CFLAGS) | 132 | AC_SUBST(LIBASSUAN_CFLAGS) |
133 | -- | ||
134 | 2.25.1 | ||
135 | |||
diff --git a/meta/recipes-support/libassuan/libassuan_2.5.4.bb b/meta/recipes-support/libassuan/libassuan_2.5.7.bb index e83f571183..d1e622635f 100644 --- a/meta/recipes-support/libassuan/libassuan_2.5.4.bb +++ b/meta/recipes-support/libassuan/libassuan_2.5.7.bb | |||
@@ -1,10 +1,13 @@ | |||
1 | SUMMARY = "IPC library used by GnuPG and GPGME" | 1 | SUMMARY = "IPC library used by GnuPG and GPGME" |
2 | DESCRIPTION = "A small library implementing the so-called Assuan protocol. \ | ||
3 | This protocol is used for IPC between most newer GnuPG components. \ | ||
4 | Both, server and client side functions are provided. " | ||
2 | HOMEPAGE = "http://www.gnupg.org/related_software/libassuan/" | 5 | HOMEPAGE = "http://www.gnupg.org/related_software/libassuan/" |
3 | BUGTRACKER = "https://bugs.g10code.com/gnupg/index" | 6 | BUGTRACKER = "https://bugs.g10code.com/gnupg/index" |
4 | 7 | ||
5 | LICENSE = "GPLv3+ & LGPLv2.1+" | 8 | LICENSE = "GPL-3.0-or-later & LGPL-2.1-or-later" |
6 | LICENSE_${PN} = "LGPLv2.1+" | 9 | LICENSE:${PN} = "LGPL-2.1-or-later" |
7 | LICENSE_${PN}-doc = "GPLv3+" | 10 | LICENSE:${PN}-doc = "GPL-3.0-or-later" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ | 11 | LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ |
9 | file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ | 12 | file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ |
10 | file://src/assuan.c;endline=20;md5=ab92143a5a2adabd06d7994d1467ea5c\ | 13 | file://src/assuan.c;endline=20;md5=ab92143a5a2adabd06d7994d1467ea5c\ |
@@ -17,18 +20,18 @@ SRC_URI = "${GNUPG_MIRROR}/libassuan/libassuan-${PV}.tar.bz2 \ | |||
17 | file://libassuan-add-pkgconfig-support.patch \ | 20 | file://libassuan-add-pkgconfig-support.patch \ |
18 | " | 21 | " |
19 | 22 | ||
20 | SRC_URI[sha256sum] = "c080ee96b3bd519edd696cfcebdecf19a3952189178db9887be713ccbcb5fbf0" | 23 | SRC_URI[sha256sum] = "0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76" |
21 | 24 | ||
22 | BINCONFIG = "${bindir}/libassuan-config" | 25 | BINCONFIG = "${bindir}/libassuan-config" |
23 | 26 | ||
24 | inherit autotools texinfo binconfig-disabled pkgconfig multilib_header | 27 | inherit autotools texinfo binconfig-disabled pkgconfig multilib_header |
25 | 28 | ||
26 | do_configure_prepend () { | 29 | do_configure:prepend () { |
27 | # Else these could be used in preference to those in aclocal-copy | 30 | # Else these could be used in preference to those in aclocal-copy |
28 | rm -f ${S}/m4/*.m4 | 31 | rm -f ${S}/m4/*.m4 |
29 | } | 32 | } |
30 | 33 | ||
31 | do_install_append () { | 34 | do_install:append () { |
32 | oe_multilib_header assuan.h | 35 | oe_multilib_header assuan.h |
33 | } | 36 | } |
34 | 37 | ||