diff options
Diffstat (limited to 'meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch')
| -rw-r--r-- | meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch | 150 |
1 files changed, 71 insertions, 79 deletions
diff --git a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch index 14a43eeeeb..831771ca2d 100644 --- a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch +++ b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch @@ -1,7 +1,7 @@ -From 8ae149035c97d27cd2c624704d1651806c53577e Mon Sep 17 00:00:00 2001 +From 7b3a00cb0fc27c896dd85c9afc474bd9c2aea30d Mon Sep 17 00:00:00 2001 From: Richard Purdie <richard.purdie@linuxfoundation.org> -Date: Wed, 16 Aug 2017 02:00:08 -0400 -Subject: [PATCH 1/5] pkgconfig +Date: Fri, 10 May 2019 14:23:55 +0800 +Subject: [PATCH] pkgconfig Update gpgme to use pkgconfig instead of -config files since its simpler and less error prone when cross compiling. @@ -11,51 +11,50 @@ RP 2015/4/17 Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> -Rebase to 1.9.0 - +Rebase to 1.13.0 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +Rebase to 1.17.0 +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> + --- configure.ac | 1 + src/Makefile.am | 4 +- - src/gpgme-pthread.pc.in | 15 +++++++ - src/gpgme.m4 | 114 ++++-------------------------------------------- - src/gpgme.pc.in | 15 +++++++ - 5 files changed, 42 insertions(+), 107 deletions(-) + src/gpgme-pthread.pc.in | 15 +++++ + src/gpgme.m4 | 119 +++------------------------------------- + src/gpgme.pc.in | 4 +- + 5 files changed, 29 insertions(+), 114 deletions(-) create mode 100644 src/gpgme-pthread.pc.in - create mode 100644 src/gpgme.pc.in diff --git a/configure.ac b/configure.ac -index 0dac6ce..6a9e507 100644 +index ae4c7da..df892c9 100644 --- a/configure.ac +++ b/configure.ac -@@ -866,6 +866,7 @@ AC_CONFIG_FILES(Makefile src/Makefile - src/versioninfo.rc +@@ -1112,6 +1112,7 @@ AC_CONFIG_FILES(Makefile src/Makefile + src/gpgme-glib.pc src/gpgme.h) AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) -+AC_CONFIG_FILES(src/gpgme.pc src/gpgme-pthread.pc) ++AC_CONFIG_FILES(src/gpgme-pthread.pc) AC_CONFIG_FILES(lang/cpp/Makefile lang/cpp/src/Makefile) + AC_CONFIG_FILES(lang/cpp/tests/Makefile) AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig-w32.cmake.in) - AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig.cmake.in) diff --git a/src/Makefile.am b/src/Makefile.am -index ce6f1d4..5f38fee 100644 +index ca70950..bda5498 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -19,12 +19,14 @@ +@@ -20,11 +20,11 @@ ## Process this file with automake to produce Makefile.in - EXTRA_DIST = gpgme-config.in gpgme.m4 libgpgme.vers ChangeLog-2011 \ -- gpgme.h.in versioninfo.rc.in gpgme.def -+ gpgme.h.in versioninfo.rc.in gpgme.def gpgme.pc.in gpgme-pthread.pc.in + pkgconfigdir = $(libdir)/pkgconfig +-pkgconfig_DATA = gpgme.pc gpgme-glib.pc ++pkgconfig_DATA = gpgme.pc gpgme-glib.pc gpgme-pthread.pc - bin_SCRIPTS = gpgme-config - m4datadir = $(datadir)/aclocal - m4data_DATA = gpgme.m4 - nodist_include_HEADERS = gpgme.h -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = gpgme.pc gpgme-pthread.pc - - bin_PROGRAMS = gpgme-tool + EXTRA_DIST = gpgme-config.in gpgme.m4 libgpgme.vers ChangeLog-2011 \ + gpgme.h.in versioninfo.rc.in gpgme.def \ +- gpgme.pc.in gpgme-glib.pc.in ++ gpgme.pc.in gpgme-glib.pc.in gpgme-pthread.pc.in + if USE_GPGRT_CONFIG + noinst_SCRIPTS = gpgme-config diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in new file mode 100644 index 0000000..074bbf6 @@ -78,10 +77,10 @@ index 0000000..074bbf6 +Cflags: -I${includedir} +Requires: libassuan gpg-error diff --git a/src/gpgme.m4 b/src/gpgme.m4 -index 6c2be44..d8a75cb 100644 +index 8cc2898..0ff550e 100644 --- a/src/gpgme.m4 +++ b/src/gpgme.m4 -@@ -79,7 +79,7 @@ dnl config script does not match the host specification the script +@@ -168,7 +168,7 @@ dnl config script does not match the host specification the script dnl is added to the gpg_config_script_warn variable. dnl AC_DEFUN([AM_PATH_GPGME], @@ -90,7 +89,7 @@ index 6c2be44..d8a75cb 100644 tmp=ifelse([$1], ,1:0.4.2,$1) if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` -@@ -89,36 +89,12 @@ AC_DEFUN([AM_PATH_GPGME], +@@ -178,36 +178,12 @@ AC_DEFUN([AM_PATH_GPGME], min_gpgme_version="$tmp" fi @@ -129,7 +128,7 @@ index 6c2be44..d8a75cb 100644 if test "$tmp" -gt 0 ; then if test "$req_gpgme_api" -ne "$tmp" ; then ok=no -@@ -127,19 +103,11 @@ AC_DEFUN([AM_PATH_GPGME], +@@ -216,19 +192,11 @@ AC_DEFUN([AM_PATH_GPGME], fi fi if test $ok = yes; then @@ -149,44 +148,45 @@ index 6c2be44..d8a75cb 100644 ]) dnl AM_PATH_GPGME_PTHREAD([MINIMUM-VERSION, -@@ -148,7 +116,7 @@ dnl Test for libgpgme and define GPGME_PTHREAD_CFLAGS +@@ -236,9 +204,8 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) + dnl Test for libgpgme and define GPGME_PTHREAD_CFLAGS dnl and GPGME_PTHREAD_LIBS. dnl - AC_DEFUN([AM_PATH_GPGME_PTHREAD], --[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl +-AC_DEFUN([AM_PATH_GPGME_PTHREAD],[ +- AC_OBSOLETE([$0], [; use AM_PATH_GPGME instead to use GPGME_CFLAGS and GPGME_LIBS])dnl +- AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl ++AC_DEFUN([AM_PATH_GPGME_PTHREAD], +[ tmp=ifelse([$1], ,1:0.4.2,$1) if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` -@@ -158,38 +126,12 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD], +@@ -248,40 +215,12 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD],[ min_gpgme_version="$tmp" fi - AC_MSG_CHECKING(for GPGME pthread - version >= $min_gpgme_version) - ok=no - if test "$GPGME_CONFIG" != "no" ; then -- if `$GPGME_CONFIG --thread=pthread 2> /dev/null` ; then -- req_major=`echo $min_gpgme_version | \ +- req_major=`echo $min_gpgme_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` -- req_minor=`echo $min_gpgme_version | \ +- req_minor=`echo $min_gpgme_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` -- req_micro=`echo $min_gpgme_version | \ +- req_micro=`echo $min_gpgme_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` -- if test "$gpgme_version_major" -gt "$req_major"; then +- if test "$gpgme_version_major" -gt "$req_major"; then - ok=yes -- else +- else - if test "$gpgme_version_major" -eq "$req_major"; then -- if test "$gpgme_version_minor" -gt "$req_minor"; then -- ok=yes -- else -- if test "$gpgme_version_minor" -eq "$req_minor"; then -- if test "$gpgme_version_micro" -ge "$req_micro"; then -- ok=yes -- fi +- if test "$gpgme_version_minor" -gt "$req_minor"; then +- ok=yes +- else +- if test "$gpgme_version_minor" -eq "$req_minor"; then +- if test "$gpgme_version_micro" -ge "$req_micro"; then +- ok=yes +- fi +- fi - fi -- fi - fi -- fi - fi - fi + PKG_CHECK_MODULES(GPGME_PTHREAD, [gpgme-pthread >= $min_gpgme_version], [ok=yes], [ok=no]) @@ -194,17 +194,21 @@ index 6c2be44..d8a75cb 100644 # If we have a recent GPGME, we should also check that the # API is compatible. if test "$req_gpgme_api" -gt 0 ; then -- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` +- if test -z "$use_gpgrt_config"; then +- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` +- else +- tmp=`$GPGME_CONFIG --variable=api_version 2>/dev/null || echo 0` +- fi + tmp=`$PKG_CONFIG --variable=api_version gpgme-pthread 2>/dev/null || echo 0` if test "$tmp" -gt 0 ; then if test "$req_gpgme_api" -ne "$tmp" ; then ok=no -@@ -198,19 +140,11 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD], +@@ -290,19 +229,11 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD],[ fi fi if test $ok = yes; then -- GPGME_PTHREAD_CFLAGS=`$GPGME_CONFIG --thread=pthread --cflags` -- GPGME_PTHREAD_LIBS=`$GPGME_CONFIG --thread=pthread --libs` +- GPGME_PTHREAD_CFLAGS=`$GPGME_CONFIG --cflags` +- GPGME_PTHREAD_LIBS=`$GPGME_CONFIG --libs` - AC_MSG_RESULT(yes) ifelse([$2], , :, [$2]) _AM_PATH_GPGME_CONFIG_HOST_CHECK @@ -219,7 +223,7 @@ index 6c2be44..d8a75cb 100644 ]) -@@ -229,36 +163,12 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], +@@ -321,36 +252,12 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], min_gpgme_version="$tmp" fi @@ -258,7 +262,7 @@ index 6c2be44..d8a75cb 100644 if test "$tmp" -gt 0 ; then if test "$req_gpgme_api" -ne "$tmp" ; then ok=no -@@ -267,17 +177,9 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], +@@ -359,17 +266,9 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], fi fi if test $ok = yes; then @@ -277,27 +281,15 @@ index 6c2be44..d8a75cb 100644 - AC_SUBST(GPGME_GLIB_LIBS) ]) diff --git a/src/gpgme.pc.in b/src/gpgme.pc.in -new file mode 100644 -index 0000000..b69539f ---- /dev/null +index 9ddef5c..932645b 100644 +--- a/src/gpgme.pc.in +++ b/src/gpgme.pc.in -@@ -0,0 +1,15 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+# API info -+api_version=@GPGME_CONFIG_API_VERSION@ -+host=@GPGME_CONFIG_HOST@ -+ -+Name: gpgme -+Description: GnuPG Made Easy (GPGME) is a C language library that allows to addsupport for cryptography to a program. -+Version: @VERSION@ -+Libs: -L${libdir} -lgpgme +@@ -9,6 +9,6 @@ Name: gpgme + Description: GnuPG Made Easy to access GnuPG + Requires.private: gpg-error, libassuan + Version: @PACKAGE_VERSION@ +-Cflags: @GPGME_CONFIG_CFLAGS@ +-Libs: @GPGME_CONFIG_LIBS@ +Cflags: -I${includedir} -+Requires: libassuan gpg-error -\ No newline at end of file --- -2.8.1 - ++Libs: -L${libdir} -lgpgme + URL: https://www.gnupg.org/software/gpgme/index.html |