diff options
Diffstat (limited to 'meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch')
| -rw-r--r-- | meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch | 134 |
1 files changed, 63 insertions, 71 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 d28dfd9ebe..bdb80ff34d 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 @@ +From ca8174aa81d7bf364b33f7254a9e887735c4996d 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 + Upstream-Status: Denied Add pkgconfig support to libksba. @@ -6,78 +11,53 @@ They think pkgconfig adds no portability and maintaining them is not worthwhile. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> -Index: libksba-1.3.0/Makefile.am -=================================================================== ---- libksba-1.3.0.orig/Makefile.am 2014-05-13 21:39:22.390385646 +0000 -+++ libksba-1.3.0/Makefile.am 2014-05-13 21:39:22.462385646 +0000 -@@ -21,6 +21,9 @@ - ACLOCAL_AMFLAGS = -I m4 -I gl/m4 - AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip - -+pkgconfigdir = ${libdir}/pkgconfig -+pkgconfig_DATA = ksba.pc -+ - # (A suitable gitlog-to-changelog script can be found in GnuPG master.) - GITLOG_TO_CHANGELOG=gitlog-to-changelog - -Index: libksba-1.3.0/configure.ac -=================================================================== ---- libksba-1.3.0.orig/configure.ac 2014-05-13 21:39:22.390385646 +0000 -+++ libksba-1.3.0/configure.ac 2014-05-13 21:39:22.462385646 +0000 -@@ -400,6 +400,7 @@ - src/Makefile - src/ksba-config - src/versioninfo.rc -+ksba.pc - tests/Makefile - doc/Makefile - ]) -Index: libksba-1.3.0/ksba.pc.in -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ libksba-1.3.0/ksba.pc.in 2014-05-13 21:39:22.462385646 +0000 -@@ -0,0 +1,17 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+# API info -+api_version=@KSBA_CONFIG_API_VERSION@ -+host=@KSBA_CONFIG_HOST@ -+ -+Name: ksba -+Description: Libksba provides an easy API to create and parse X.509 and CMS related objects -+Requires: -+Version: @VERSION@ -+Libs: -L${libdir} -lksba -+Libs.private: -L${libdir} -lgpg-error -+Cflags: -I${includedir} -+ -Index: libksba-1.3.0/src/ksba.m4 -=================================================================== ---- libksba-1.3.0.orig/src/ksba.m4 2014-05-13 21:39:22.390385646 +0000 -+++ libksba-1.3.0/src/ksba.m4 2014-05-13 21:49:03.650382696 +0000 -@@ -22,18 +22,7 @@ +--- + src/ksba.m4 | 90 +++-------------------------------------------------- + 1 file changed, 4 insertions(+), 86 deletions(-) + +diff --git a/src/ksba.m4 b/src/ksba.m4 +index 452c245..aa96255 100644 +--- a/src/ksba.m4 ++++ b/src/ksba.m4 +@@ -23,37 +23,6 @@ dnl with a changed API. dnl AC_DEFUN([AM_PATH_KSBA], - [AC_REQUIRE([AC_CANONICAL_HOST]) -- AC_ARG_WITH(ksba-prefix, -- AC_HELP_STRING([--with-ksba-prefix=PFX], -- [prefix where KSBA is installed (optional)]), + [ AC_REQUIRE([AC_CANONICAL_HOST]) +- dnl --with-libksba-prefix=PFX is the preferred name for this option, +- 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, +- AS_HELP_STRING([--with-libksba-prefix=PFX], +- [prefix where KSBA is installed (optional)]), +- ksba_config_prefix="$withval", ksba_config_prefix="") +- +- dnl Accept --with-ksba-prefix and make it work the same as +- dnl --with-libksba-prefix above, for backwards compatibility, +- dnl but do not document this old, inconsistently-named option. +- AC_ARG_WITH(ksba-prefix,, - ksba_config_prefix="$withval", ksba_config_prefix="") +- - if test x$ksba_config_prefix != x ; then -- ksba_config_args="$ksba_config_args --prefix=$ksba_config_prefix" -- if test x${KSBA_CONFIG+set} != xset ; then -- KSBA_CONFIG=$ksba_config_prefix/bin/ksba-config -- fi +- if test x${KSBA_CONFIG+set} != xset ; then +- KSBA_CONFIG=$ksba_config_prefix/bin/ksba-config +- fi +- fi +- +- use_gpgrt_config="" +- if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then +- if $GPGRT_CONFIG ksba --exists; then +- KSBA_CONFIG="$GPGRT_CONFIG ksba" +- AC_MSG_NOTICE([Use gpgrt-config as ksba-config]) +- use_gpgrt_config=yes +- fi +- fi +- if test -z "$use_gpgrt_config"; then +- AC_PATH_PROG(KSBA_CONFIG, ksba-config, no) - fi -- AC_PATH_PROG(KSBA_CONFIG, ksba-config, no) tmp=ifelse([$1], ,1:1.0.0,$1) if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then - req_ksba_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` -@@ -43,48 +32,13 @@ +@@ -64,56 +33,13 @@ AC_DEFUN([AM_PATH_KSBA], min_ksba_version="$tmp" fi @@ -90,7 +70,11 @@ Index: libksba-1.3.0/src/ksba.m4 - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` - req_micro=`echo $min_ksba_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` -- ksba_config_version=`$KSBA_CONFIG $ksba_config_args --version` +- if test -z "$use_gpgrt_config"; then +- ksba_config_version=`$KSBA_CONFIG --version` +- else +- ksba_config_version=`$KSBA_CONFIG --modversion` +- fi - major=`echo $ksba_config_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` - minor=`echo $ksba_config_version | \ @@ -124,24 +108,32 @@ Index: libksba-1.3.0/src/ksba.m4 # Even if we have a recent libksba, we should check that the # API is compatible. if test "$req_ksba_api" -gt 0 ; then -- tmp=`$KSBA_CONFIG --api-version 2>/dev/null || echo 0` +- if test -z "$use_gpgrt_config"; then +- tmp=`$KSBA_CONFIG --api-version 2>/dev/null || echo 0` +- else +- tmp=`$KSBA_CONFIG --variable=api_version 2>/dev/null || echo 0` +- fi + tmp=`$PKG_CONFIG --variable=api_version ksba` if test "$tmp" -gt 0 ; then AC_MSG_CHECKING([KSBA API version]) if test "$req_ksba_api" -eq "$tmp" ; then -@@ -97,10 +51,8 @@ +@@ -126,14 +52,8 @@ AC_DEFUN([AM_PATH_KSBA], fi fi if test $ok = yes; then -- KSBA_CFLAGS=`$KSBA_CONFIG $ksba_config_args --cflags` -- KSBA_LIBS=`$KSBA_CONFIG $ksba_config_args --libs` +- KSBA_CFLAGS=`$KSBA_CONFIG --cflags` +- KSBA_LIBS=`$KSBA_CONFIG --libs` ifelse([$2], , :, [$2]) -- libksba_config_host=`$LIBKSBA_CONFIG $ksba_config_args --host 2>/dev/null || echo none` +- if test -z "$use_gpgrt_config"; then +- libksba_config_host=`$KSBA_CONFIG --host 2>/dev/null || echo none` +- else +- libksba_config_host=`$KSBA_CONFIG --variable=host 2>/dev/null || echo none` +- fi + libksba_config_host=`$PKG_CONFIG --variable=host ksba` if test x"$libksba_config_host" != xnone ; then if test x"$libksba_config_host" != x"$host" ; then AC_MSG_WARN([[ -@@ -114,8 +66,6 @@ +@@ -147,8 +67,6 @@ AC_DEFUN([AM_PATH_KSBA], fi fi else |