diff options
Diffstat (limited to 'meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch')
| -rw-r--r-- | meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch | 125 |
1 files changed, 51 insertions, 74 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 b6ccdda6a5..fe811254d3 100644 --- a/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch +++ b/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch @@ -6,88 +6,52 @@ Upstream-Status: Denied Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Constantin Musca <constantinx.musca@intel.com> -Index: libassuan-2.1.2/Makefile.am -=================================================================== ---- libassuan-2.1.2.orig/Makefile.am -+++ libassuan-2.1.2/Makefile.am -@@ -24,10 +24,13 @@ AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gz - # (A suitable gitlog-to-changelog script can be found in GnuPG master.) - GITLOG_TO_CHANGELOG=gitlog-to-changelog - -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = libassuan.pc -+ - EXTRA_DIST = autogen.sh autogen.rc README.GIT \ - ChangeLog-2011 doc/ChangeLog-2011 src/ChangeLog-2011 \ - tests/ChangeLog-2011 contrib/ChangeLog-2011 \ -- build-aux/git-log-footer build-aux/git-log-fix -+ build-aux/git-log-footer build-aux/git-log-fix libassuan.pc.in - - SUBDIRS = m4 src doc tests - -Index: libassuan-2.1.2/libassuan.pc.in -=================================================================== ---- /dev/null -+++ libassuan-2.1.2/libassuan.pc.in -@@ -0,0 +1,14 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+api_version=@LIBASSUAN_CONFIG_API_VERSION@ -+host=@LIBASSUAN_CONFIG_HOST@ -+ -+Name: libassuan -+Description: IPC library used by GnuPG and GPGME -+Requires: -+Version: @VERSION@ -+Libs: -L${libdir} -lassuan -+Libs.private: -lgpg-error -+Cflags: -I${includedir} -Index: libassuan-2.1.2/configure.ac -=================================================================== ---- libassuan-2.1.2.orig/configure.ac -+++ libassuan-2.1.2/configure.ac -@@ -439,7 +439,7 @@ AC_CONFIG_FILES([doc/Makefile]) - AC_CONFIG_FILES([tests/Makefile]) - AC_CONFIG_FILES([src/libassuan-config], [chmod +x src/libassuan-config]) - AC_CONFIG_FILES([src/versioninfo.rc]) -- -+AC_CONFIG_FILES([libassuan.pc]) - AC_OUTPUT - - echo " -Index: libassuan-2.1.2/src/libassuan.m4 -=================================================================== ---- libassuan-2.1.2.orig/src/libassuan.m4 -+++ libassuan-2.1.2/src/libassuan.m4 -@@ -15,18 +15,6 @@ dnl Returns ok set to yes or no. +forward ported to 2.4.4 +Signed-off-by: Armin Kuster <akuster@mvista.com> +--- + src/libassuan.m4 | 81 ++---------------------------------------------- + 1 file changed, 3 insertions(+), 78 deletions(-) + +diff --git a/src/libassuan.m4 b/src/libassuan.m4 +index df50484..380a48a 100644 +--- a/src/libassuan.m4 ++++ b/src/libassuan.m4 +@@ -17,27 +17,6 @@ dnl Returns ok set to yes or no. dnl AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], [ AC_REQUIRE([AC_CANONICAL_HOST]) - AC_ARG_WITH(libassuan-prefix, -- AC_HELP_STRING([--with-libassuan-prefix=PFX], +- AS_HELP_STRING([--with-libassuan-prefix=PFX], - [prefix where LIBASSUAN is installed (optional)]), - libassuan_config_prefix="$withval", libassuan_config_prefix="") - if test x$libassuan_config_prefix != x ; then -- libassuan_config_args="$libassuan_config_args --prefix=$libassuan_config_prefix" - if test x${LIBASSUAN_CONFIG+set} != xset ; then - LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config - fi - fi - -- AC_PATH_TOOL(LIBASSUAN_CONFIG, libassuan-config, no) +- use_gpgrt_config="" +- if test x"${LIBASSUAN_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then +- if $GPGRT_CONFIG libassuan --exists; then +- LIBASSUAN_CONFIG="$GPGRT_CONFIG libassuan" +- AC_MSG_NOTICE([Use gpgrt-config as libassuan-config]) +- use_gpgrt_config=yes +- fi +- fi +- if test -z "$use_gpgrt_config"; then +- AC_PATH_PROG(LIBASSUAN_CONFIG, libassuan-config, no) +- fi tmp=ifelse([$1], ,1:0.9.2,$1) if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then -@@ -37,51 +25,12 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], +@@ -47,59 +26,11 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], + req_libassuan_api=0 min_libassuan_version="$tmp" fi - +- - AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version) - ok=no -- if test "$LIBASSUAN_CONFIG" != "no" \ -- && test -f "$LIBASSUAN_CONFIG" ; then +- if test "$LIBASSUAN_CONFIG" != "no"; then - req_major=`echo $min_libassuan_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` - req_minor=`echo $min_libassuan_version | \ @@ -95,7 +59,11 @@ Index: libassuan-2.1.2/src/libassuan.m4 - req_micro=`echo $min_libassuan_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` - -- libassuan_config_version=`$LIBASSUAN_CONFIG --version` +- if test -z "$use_gpgrt_config"; then +- libassuan_config_version=`$LIBASSUAN_CONFIG --version` +- else +- libassuan_config_version=`$LIBASSUAN_CONFIG --modversion` +- fi - major=`echo $libassuan_config_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` - minor=`echo $libassuan_config_version | \ @@ -105,7 +73,7 @@ Index: libassuan-2.1.2/src/libassuan.m4 - - if test "$major" -gt "$req_major"; then - ok=yes -- else +- else - if test "$major" -eq "$req_major"; then - if test "$minor" -gt "$req_minor"; then - ok=yes @@ -129,26 +97,32 @@ Index: libassuan-2.1.2/src/libassuan.m4 if test $ok = yes; then if test "$req_libassuan_api" -gt 0 ; then - tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0` +- if test -z "$use_gpgrt_config"; then +- tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0` +- else +- tmp=`$LIBASSUAN_CONFIG --variable=api_version 2>/dev/null || echo 0` +- fi + tmp=`$PKG_CONFIG --variable=api_version libassuan` if test "$tmp" -gt 0 ; then AC_MSG_CHECKING([LIBASSUAN API version]) if test "$req_libassuan_api" -eq "$tmp" ; then -@@ -96,7 +45,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], - +@@ -115,9 +46,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], if test $ok = yes; then if test x"$host" != x ; then -- libassuan_config_host=`$LIBASSUAN_CONFIG --host 2>/dev/null || echo none` -+ libassuan_config_host=`$PKG_CONFIG --variable=host libassuan` + if test -z "$use_gpgrt_config"; then +- libassuan_config_host=`$LIBASSUAN_CONFIG --host 2>/dev/null || echo none` +- else +- libassuan_config_host=`$LIBASSUAN_CONFIG --variable=host 2>/dev/null || echo none` ++ libassuan_config_host=`$PKG_CONFIG --variable=host libassuan` + fi if test x"$libassuan_config_host" != xnone ; then if test x"$libassuan_config_host" != x"$host" ; then - AC_MSG_WARN([[ -@@ -137,12 +86,8 @@ dnl +@@ -159,12 +88,8 @@ dnl AC_DEFUN([AM_PATH_LIBASSUAN], [ _AM_PATH_LIBASSUAN_COMMON($1) if test $ok = yes; then -- LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --cflags` -- LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs` +- LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG --cflags` +- LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG --libs` ifelse([$2], , :, [$2]) else - LIBASSUAN_CFLAGS="" @@ -156,3 +130,6 @@ Index: libassuan-2.1.2/src/libassuan.m4 ifelse([$3], , :, [$3]) fi AC_SUBST(LIBASSUAN_CFLAGS) +-- +2.25.1 + |