summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2025-03-04 17:08:52 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-03-06 11:16:47 +0000
commit61a3561b955394581da052acd3b314fb4d197edd (patch)
tree7191bae9b19d8d9d699c11dce7cecaf37603724e
parentb95eb313f785b220e38afabd55741b3517a0fcf4 (diff)
downloadpoky-61a3561b955394581da052acd3b314fb4d197edd.tar.gz
libassuan: upgrade 3.0.1 -> 3.0.2
libassuan-add-pkgconfig-support.patch refreshed for 3.0.2 (From OE-Core rev: b91289cf3f6c0bc4e718462a8fd44a50f0687313) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch19
-rw-r--r--meta/recipes-support/libassuan/libassuan_3.0.2.bb (renamed from meta/recipes-support/libassuan/libassuan_3.0.1.bb)2
2 files changed, 10 insertions, 11 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 d67087f4ac..20361e8a99 100644
--- a/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch
+++ b/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch
@@ -15,11 +15,11 @@ easier use.
15 15
16Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> 16Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
17--- 17---
18 src/libassuan.m4 | 82 ++---------------------------------------------- 18 src/libassuan.m4 | 81 ++----------------------------------------------
19 1 file changed, 3 insertions(+), 79 deletions(-) 19 1 file changed, 3 insertions(+), 78 deletions(-)
20 20
21diff --git a/src/libassuan.m4 b/src/libassuan.m4 21diff --git a/src/libassuan.m4 b/src/libassuan.m4
22index 2e98b39..404796f 100644 22index 4d7da17..f4692ab 100644
23--- a/src/libassuan.m4 23--- a/src/libassuan.m4
24+++ b/src/libassuan.m4 24+++ b/src/libassuan.m4
25@@ -103,27 +103,6 @@ dnl 25@@ -103,27 +103,6 @@ dnl
@@ -50,11 +50,10 @@ index 2e98b39..404796f 100644
50 50
51 tmp=ifelse([$1], ,1:0.9.2,$1) 51 tmp=ifelse([$1], ,1:0.9.2,$1)
52 if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then 52 if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
53@@ -133,60 +112,11 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], 53@@ -134,59 +113,11 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
54 req_libassuan_api=0
55 min_libassuan_version="$tmp" 54 min_libassuan_version="$tmp"
56 fi 55 fi
57- 56
58- AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version) 57- AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version)
59- ok=no 58- ok=no
60- if test "$LIBASSUAN_CONFIG" != "no"; then 59- if test "$LIBASSUAN_CONFIG" != "no"; then
@@ -96,7 +95,7 @@ index 2e98b39..404796f 100644
96- 95-
97- if test $ok = yes; then 96- if test $ok = yes; then
98- AC_MSG_RESULT([yes ($libassuan_config_version)]) 97- AC_MSG_RESULT([yes ($libassuan_config_version)])
99- AC_DEFINE(LIBASSUAN_API_REQUESTED, $req_libassuan_api, Requested API version for libassuan) 98- AC_DEFINE_UNQUOTED(LIBASSUAN_API_REQUESTED, $req_libassuan_api, [Requested API version for libassuan])
100- else 99- else
101- AC_MSG_RESULT(no) 100- AC_MSG_RESULT(no)
102- fi 101- fi
@@ -113,7 +112,7 @@ index 2e98b39..404796f 100644
113 if test "$tmp" -gt 0 ; then 112 if test "$tmp" -gt 0 ; then
114 AC_MSG_CHECKING([LIBASSUAN API version]) 113 AC_MSG_CHECKING([LIBASSUAN API version])
115 if test "$req_libassuan_api" -eq "$tmp" ; then 114 if test "$req_libassuan_api" -eq "$tmp" ; then
116@@ -204,9 +134,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], 115@@ -204,9 +135,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
117 if test $ok = yes; then 116 if test $ok = yes; then
118 if test x"$host" != x ; then 117 if test x"$host" != x ; then
119 if test -z "$use_gpgrt_config"; then 118 if test -z "$use_gpgrt_config"; then
@@ -124,7 +123,7 @@ index 2e98b39..404796f 100644
124 fi 123 fi
125 if test x"$libassuan_config_host" != xnone ; then 124 if test x"$libassuan_config_host" != xnone ; then
126 if test x"$libassuan_config_host" != x"$host" ; then 125 if test x"$libassuan_config_host" != x"$host" ; then
127@@ -248,12 +176,8 @@ dnl 126@@ -248,12 +177,8 @@ dnl
128 AC_DEFUN([AM_PATH_LIBASSUAN], 127 AC_DEFUN([AM_PATH_LIBASSUAN],
129 [ _AM_PATH_LIBASSUAN_COMMON($1) 128 [ _AM_PATH_LIBASSUAN_COMMON($1)
130 if test $ok = yes; then 129 if test $ok = yes; then
@@ -138,5 +137,5 @@ index 2e98b39..404796f 100644
138 fi 137 fi
139 AC_SUBST(LIBASSUAN_CFLAGS) 138 AC_SUBST(LIBASSUAN_CFLAGS)
140-- 139--
1412.39.2 1402.43.0
142 141
diff --git a/meta/recipes-support/libassuan/libassuan_3.0.1.bb b/meta/recipes-support/libassuan/libassuan_3.0.2.bb
index 0518ed75aa..f0b7746284 100644
--- a/meta/recipes-support/libassuan/libassuan_3.0.1.bb
+++ b/meta/recipes-support/libassuan/libassuan_3.0.2.bb
@@ -20,7 +20,7 @@ SRC_URI = "${GNUPG_MIRROR}/libassuan/libassuan-${PV}.tar.bz2 \
20 file://libassuan-add-pkgconfig-support.patch \ 20 file://libassuan-add-pkgconfig-support.patch \
21 " 21 "
22 22
23SRC_URI[sha256sum] = "c8f0f42e6103dea4b1a6a483cb556654e97302c7465308f58363778f95f194b1" 23SRC_URI[sha256sum] = "d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6"
24 24
25BINCONFIG = "${bindir}/libassuan-config" 25BINCONFIG = "${bindir}/libassuan-config"
26 26