summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-06-08 09:46:50 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-09 13:14:00 +0100
commitfbdb937206ec3bf26e019219672392fe99390eb0 (patch)
tree73c6e6cd77fdb03ea544eb62b9752f7bafbcba21
parente71947c1d2cdf08b7dc60c3c7fdf49409f559fc0 (diff)
downloadpoky-fbdb937206ec3bf26e019219672392fe99390eb0.tar.gz
libksba: 1.3.5 -> 1.4.0
Adjust the pkg-config patch: - upstream added their own .pc file, so adding it again is not needed. - ksba.m4 adjustment to use pkg-config remains in place, but has to be rebased. (From OE-Core rev: 6ce510f38cafe86229b225bb6727e538bd35258c) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch130
-rw-r--r--meta/recipes-support/libksba/libksba_1.4.0.bb (renamed from meta/recipes-support/libksba/libksba_1.3.5.bb)3
2 files changed, 60 insertions, 73 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 5afe6de923..ebb7fa588a 100644
--- a/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch
+++ b/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch
@@ -1,3 +1,8 @@
1From 7bd2b060e9ea3e2ff11e67d1e98ab882819b28b7 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Mon, 3 Dec 2012 18:17:31 +0800
4Subject: [PATCH] libksba: add pkgconfig support
5
1Upstream-Status: Denied 6Upstream-Status: Denied
2 7
3Add pkgconfig support to libksba. 8Add pkgconfig support to libksba.
@@ -6,78 +11,49 @@ They think pkgconfig adds no portability and maintaining them is not worthwhile.
6 11
7Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 12Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
8 13
9Index: libksba-1.3.5/Makefile.am 14diff --git a/src/ksba.m4 b/src/ksba.m4
10=================================================================== 15index ad8de4f..af903ad 100644
11--- libksba-1.3.5.orig/Makefile.am 16--- a/src/ksba.m4
12+++ libksba-1.3.5/Makefile.am 17+++ b/src/ksba.m4
13@@ -20,6 +20,9 @@ 18@@ -22,37 +22,6 @@ dnl with a changed API.
14
15 ACLOCAL_AMFLAGS = -I m4 -I gl/m4
16
17+pkgconfigdir = ${libdir}/pkgconfig
18+pkgconfig_DATA = ksba.pc
19+
20 # (A suitable gitlog-to-changelog script can be found in GnuPG master.)
21 GITLOG_TO_CHANGELOG=gitlog-to-changelog
22
23Index: libksba-1.3.5/configure.ac
24===================================================================
25--- libksba-1.3.5.orig/configure.ac
26+++ libksba-1.3.5/configure.ac
27@@ -414,6 +414,7 @@ gl/Makefile
28 src/Makefile
29 src/ksba-config
30 src/versioninfo.rc
31+ksba.pc
32 tests/Makefile
33 doc/Makefile
34 ])
35Index: libksba-1.3.5/ksba.pc.in
36===================================================================
37--- /dev/null
38+++ libksba-1.3.5/ksba.pc.in
39@@ -0,0 +1,17 @@
40+prefix=@prefix@
41+exec_prefix=@exec_prefix@
42+libdir=@libdir@
43+includedir=@includedir@
44+
45+# API info
46+api_version=@KSBA_CONFIG_API_VERSION@
47+host=@KSBA_CONFIG_HOST@
48+
49+Name: ksba
50+Description: Libksba provides an easy API to create and parse X.509 and CMS related objects
51+Requires:
52+Version: @VERSION@
53+Libs: -L${libdir} -lksba
54+Libs.private: -L${libdir} -lgpg-error
55+Cflags: -I${includedir}
56+
57Index: libksba-1.3.5/src/ksba.m4
58===================================================================
59--- libksba-1.3.5.orig/src/ksba.m4
60+++ libksba-1.3.5/src/ksba.m4
61@@ -22,18 +22,7 @@ dnl with a changed API.
62 dnl 19 dnl
63 AC_DEFUN([AM_PATH_KSBA], 20 AC_DEFUN([AM_PATH_KSBA],
64 [AC_REQUIRE([AC_CANONICAL_HOST]) 21 [ AC_REQUIRE([AC_CANONICAL_HOST])
65- AC_ARG_WITH(ksba-prefix, 22- dnl --with-libksba-prefix=PFX is the preferred name for this option,
66- AC_HELP_STRING([--with-ksba-prefix=PFX], 23- dnl since that is consistent with how our three siblings use the directory/
67- [prefix where KSBA is installed (optional)]), 24- dnl package name in --with-$dir_name-prefix=PFX.
25- AC_ARG_WITH(libksba-prefix,
26- AC_HELP_STRING([--with-libksba-prefix=PFX],
27- [prefix where KSBA is installed (optional)]),
28- ksba_config_prefix="$withval", ksba_config_prefix="")
29-
30- dnl Accept --with-ksba-prefix and make it work the same as
31- dnl --with-libksba-prefix above, for backwards compatibility,
32- dnl but do not document this old, inconsistently-named option.
33- AC_ARG_WITH(ksba-prefix,,
68- ksba_config_prefix="$withval", ksba_config_prefix="") 34- ksba_config_prefix="$withval", ksba_config_prefix="")
35-
69- if test x$ksba_config_prefix != x ; then 36- if test x$ksba_config_prefix != x ; then
70- ksba_config_args="$ksba_config_args --prefix=$ksba_config_prefix" 37- if test x${KSBA_CONFIG+set} != xset ; then
71- if test x${KSBA_CONFIG+set} != xset ; then 38- KSBA_CONFIG=$ksba_config_prefix/bin/ksba-config
72- KSBA_CONFIG=$ksba_config_prefix/bin/ksba-config 39- fi
73- fi 40- fi
41-
42- use_gpgrt_config=""
43- if test x"$KSBA_CONFIG" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
44- if $GPGRT_CONFIG ksba --exists; then
45- KSBA_CONFIG="$GPGRT_CONFIG ksba"
46- AC_MSG_NOTICE([Use gpgrt-config as ksba-config])
47- use_gpgrt_config=yes
48- fi
49- fi
50- if test -z "$use_gpgrt_config"; then
51- AC_PATH_PROG(KSBA_CONFIG, ksba-config, no)
74- fi 52- fi
75 53
76- AC_PATH_PROG(KSBA_CONFIG, ksba-config, no)
77 tmp=ifelse([$1], ,1:1.0.0,$1) 54 tmp=ifelse([$1], ,1:1.0.0,$1)
78 if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then 55 if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
79 req_ksba_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` 56@@ -63,56 +32,13 @@ AC_DEFUN([AM_PATH_KSBA],
80@@ -43,48 +32,13 @@ AC_DEFUN([AM_PATH_KSBA],
81 min_ksba_version="$tmp" 57 min_ksba_version="$tmp"
82 fi 58 fi
83 59
@@ -90,7 +66,11 @@ Index: libksba-1.3.5/src/ksba.m4
90- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` 66- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
91- req_micro=`echo $min_ksba_version | \ 67- req_micro=`echo $min_ksba_version | \
92- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` 68- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
93- ksba_config_version=`$KSBA_CONFIG $ksba_config_args --version` 69- if test -z "$use_gpgrt_config"; then
70- ksba_config_version=`$KSBA_CONFIG --version`
71- else
72- ksba_config_version=`$KSBA_CONFIG --modversion`
73- fi
94- major=`echo $ksba_config_version | \ 74- major=`echo $ksba_config_version | \
95- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` 75- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
96- minor=`echo $ksba_config_version | \ 76- minor=`echo $ksba_config_version | \
@@ -124,24 +104,32 @@ Index: libksba-1.3.5/src/ksba.m4
124 # Even if we have a recent libksba, we should check that the 104 # Even if we have a recent libksba, we should check that the
125 # API is compatible. 105 # API is compatible.
126 if test "$req_ksba_api" -gt 0 ; then 106 if test "$req_ksba_api" -gt 0 ; then
127- tmp=`$KSBA_CONFIG --api-version 2>/dev/null || echo 0` 107- if test -z "$use_gpgrt_config"; then
108- tmp=`$KSBA_CONFIG --api-version 2>/dev/null || echo 0`
109- else
110- tmp=`$KSBA_CONFIG --variable=api_version 2>/dev/null || echo 0`
111- fi
128+ tmp=`$PKG_CONFIG --variable=api_version ksba` 112+ tmp=`$PKG_CONFIG --variable=api_version ksba`
129 if test "$tmp" -gt 0 ; then 113 if test "$tmp" -gt 0 ; then
130 AC_MSG_CHECKING([KSBA API version]) 114 AC_MSG_CHECKING([KSBA API version])
131 if test "$req_ksba_api" -eq "$tmp" ; then 115 if test "$req_ksba_api" -eq "$tmp" ; then
132@@ -97,10 +51,8 @@ AC_DEFUN([AM_PATH_KSBA], 116@@ -125,14 +51,8 @@ AC_DEFUN([AM_PATH_KSBA],
133 fi 117 fi
134 fi 118 fi
135 if test $ok = yes; then 119 if test $ok = yes; then
136- KSBA_CFLAGS=`$KSBA_CONFIG $ksba_config_args --cflags` 120- KSBA_CFLAGS=`$KSBA_CONFIG --cflags`
137- KSBA_LIBS=`$KSBA_CONFIG $ksba_config_args --libs` 121- KSBA_LIBS=`$KSBA_CONFIG --libs`
138 ifelse([$2], , :, [$2]) 122 ifelse([$2], , :, [$2])
139- libksba_config_host=`$LIBKSBA_CONFIG $ksba_config_args --host 2>/dev/null || echo none` 123- if test -z "$use_gpgrt_config"; then
124- libksba_config_host=`$KSBA_CONFIG --host 2>/dev/null || echo none`
125- else
126- libksba_config_host=`$KSBA_CONFIG --variable=host 2>/dev/null || echo none`
127- fi
140+ libksba_config_host=`$PKG_CONFIG --variable=host ksba` 128+ libksba_config_host=`$PKG_CONFIG --variable=host ksba`
141 if test x"$libksba_config_host" != xnone ; then 129 if test x"$libksba_config_host" != xnone ; then
142 if test x"$libksba_config_host" != x"$host" ; then 130 if test x"$libksba_config_host" != x"$host" ; then
143 AC_MSG_WARN([[ 131 AC_MSG_WARN([[
144@@ -114,8 +66,6 @@ AC_DEFUN([AM_PATH_KSBA], 132@@ -146,8 +66,6 @@ AC_DEFUN([AM_PATH_KSBA],
145 fi 133 fi
146 fi 134 fi
147 else 135 else
diff --git a/meta/recipes-support/libksba/libksba_1.3.5.bb b/meta/recipes-support/libksba/libksba_1.4.0.bb
index 336d7f8177..a9daf22d77 100644
--- a/meta/recipes-support/libksba/libksba_1.3.5.bb
+++ b/meta/recipes-support/libksba/libksba_1.4.0.bb
@@ -19,8 +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[md5sum] = "8302a3e263a7c630aa7dea7d341f07a2" 22SRC_URI[sha256sum] = "bfe6a8e91ff0f54d8a329514db406667000cb207238eded49b599761bfca41b6"
23SRC_URI[sha256sum] = "41444fd7a6ff73a79ad9728f985e71c9ba8cd3e5e53358e70d5f066d35c1a340"
24 23
25do_configure_prepend () { 24do_configure_prepend () {
26 # 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