diff options
Diffstat (limited to 'external/poky/meta/recipes-support/gpgme')
11 files changed, 288 insertions, 156 deletions
diff --git a/external/poky/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch b/external/poky/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch new file mode 100644 index 00000000..0ed4eb68 --- /dev/null +++ b/external/poky/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch @@ -0,0 +1,134 @@ +From a001b3c23bf80fd752044615b9bba6b926ff9666 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Fri, 10 May 2019 14:18:04 +0800 +Subject: [PATCH] Revert "build: Make gpgme.m4 use gpgrt-config with *.pc." + +This reverts commit 60828a505a1c74fd34476c181df2a588ea6f9c83. + +The oe-core does not support gpgrt-config, so revert it + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + src/gpgme.m4 | 58 ++++++++++------------------------------------------------ + 1 file changed, 10 insertions(+), 48 deletions(-) + +diff --git a/src/gpgme.m4 b/src/gpgme.m4 +index 2a72f18..6c2be44 100644 +--- a/src/gpgme.m4 ++++ b/src/gpgme.m4 +@@ -1,5 +1,5 @@ + # gpgme.m4 - autoconf macro to detect GPGME. +-# Copyright (C) 2002, 2003, 2004, 2014, 2018 g10 Code GmbH ++# Copyright (C) 2002, 2003, 2004, 2014 g10 Code GmbH + # + # This file is free software; as a special exception the author gives + # unlimited permission to copy and/or distribute it, with or without +@@ -9,7 +9,7 @@ + # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the + # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + # +-# Last-changed: 2018-11-12 ++# Last-changed: 2014-10-02 + + + AC_DEFUN([_AM_PATH_GPGME_CONFIG], +@@ -36,24 +36,10 @@ AC_DEFUN([_AM_PATH_GPGME_CONFIG], + fi + fi + +- use_gpgrt_config="" +- if test x"${GPGME_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then +- if $GPGRT_CONFIG gpgme --exists; then +- GPGME_CONFIG="$GPGRT_CONFIG gpgme" +- AC_MSG_NOTICE([Use gpgrt-config as gpgme-config]) +- use_gpgrt_config=yes +- fi +- fi +- if test -z "$use_gpgrt_config"; then +- AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no) +- fi ++ AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no) + + if test "$GPGME_CONFIG" != "no" ; then +- if test -z "$use_gpgrt_config"; then +- gpgme_version=`$GPGME_CONFIG --version` +- else +- gpgme_version=`$GPGME_CONFIG --modversion` +- fi ++ gpgme_version=`$GPGME_CONFIG --version` + fi + gpgme_version_major=`echo $gpgme_version | \ + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` +@@ -66,16 +52,12 @@ AC_DEFUN([_AM_PATH_GPGME_CONFIG], + + AC_DEFUN([_AM_PATH_GPGME_CONFIG_HOST_CHECK], + [ +- if test -z "$use_gpgrt_config"; then +- gpgme_config_host=`$GPGME_CONFIG --host 2>/dev/null || echo none` +- else +- gpgme_config_host=`$GPGME_CONFIG --variable=host 2>/dev/null || echo none` +- fi ++ gpgme_config_host=`$GPGME_CONFIG --host 2>/dev/null || echo none` + if test x"$gpgme_config_host" != xnone ; then + if test x"$gpgme_config_host" != x"$host" ; then + AC_MSG_WARN([[ + *** +-*** The config script "$GPGME_CONFIG" was ++*** The config script $GPGME_CONFIG was + *** built for $gpgme_config_host and thus may not match the + *** used host $host. + *** You may want to use the configure option --with-gpgme-prefix +@@ -136,11 +118,7 @@ AC_DEFUN([AM_PATH_GPGME], + # If we have a recent GPGME, we should also check that the + # API is compatible. + if test "$req_gpgme_api" -gt 0 ; then +- 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=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` + if test "$tmp" -gt 0 ; then + if test "$req_gpgme_api" -ne "$tmp" ; then + ok=no +@@ -280,11 +258,7 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], + # If we have a recent GPGME, we should also check that the + # API is compatible. + if test "$req_gpgme_api" -gt 0 ; then +- 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=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` + if test "$tmp" -gt 0 ; then + if test "$req_gpgme_api" -ne "$tmp" ; then + ok=no +@@ -293,20 +267,8 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], + fi + fi + if test $ok = yes; then +- if test -z "$use_gpgrt_config"; then +- GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --glib --cflags` +- GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs` +- else +- if $GPGRT_CONFIG gpgme-glib --exists; then +- GPGME_CONFIG="$GPGRT_CONFIG gpgme-glib" +- GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --cflags` +- GPGME_GLIB_LIBS=`$GPGME_CONFIG --libs` +- else +- ok = no +- fi +- fi +- fi +- if test $ok = yes; then ++ GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --glib --cflags` ++ GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs` + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + _AM_PATH_GPGME_CONFIG_HOST_CHECK +-- +2.7.4 + diff --git a/external/poky/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch b/external/poky/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch index ae9a46ed..827d95a1 100644 --- a/external/poky/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch +++ b/external/poky/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch @@ -1,7 +1,7 @@ -From c452ba58dd2f99d6e624421697417cc018f9a67a Mon Sep 17 00:00:00 2001 +From 98ce65902b197faa8f660564613ca2e504c2f8f8 Mon Sep 17 00:00:00 2001 From: Richard Purdie <richard.purdie@linuxfoundation.org> -Date: Fri, 29 Jun 2018 14:35:41 +0800 -Subject: [PATCH 1/7] 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,7 +11,7 @@ RP 2015/4/17 Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> -Rebase to 1.11.1 +Rebase to 1.13.0 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- @@ -19,43 +19,40 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 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.pc.in | 4 +- + 5 files changed, 28 insertions(+), 110 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 2a35404..7485cdf 100644 +index 25184f4..1c0a386 100644 --- a/configure.ac +++ b/configure.ac -@@ -886,6 +886,7 @@ AC_CONFIG_FILES(Makefile src/Makefile - src/versioninfo.rc +@@ -899,6 +899,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 0a196e0..cecaf8f 100644 +index d85a85c..d942f3e 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 + pkgconfigdir = $(libdir)/pkgconfig +-pkgconfig_DATA = gpgme.pc gpgme-glib.pc ++pkgconfig_DATA = gpgme.pc gpgme-glib.pc gpgme-pthread.pc + 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 + 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 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 gpgme-json - diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in new file mode 100644 index 0000000..074bbf6 @@ -277,27 +274,18 @@ 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 be288b8..16f56ac 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: 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 ++Libs: -L${libdir} -lgpgme + URL: https://www.gnupg.org/software/gpgme/index.html -- 2.7.4 diff --git a/external/poky/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch b/external/poky/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch index 4f5cedac..ecd1793a 100644 --- a/external/poky/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch +++ b/external/poky/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch @@ -1,6 +1,6 @@ -From 45d828356efc140a1492befb1e6dc59a9f4e16b5 Mon Sep 17 00:00:00 2001 +From 52f8fd2010b900c7d382a7c4e6c1a317d8160585 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Wed, 31 Jan 2018 10:44:19 +0800 +Date: Fri, 10 May 2019 14:30:36 +0800 Subject: [PATCH 2/7] gpgme/lang/python: gpg-error-config should not be used gpg-error-config was modified by OE to always return an error. @@ -11,38 +11,39 @@ Upstream-Status: Inappropriate [changes are specific to OE] Signed-off-by: Mark Hatle <mark.hatle@windriver.com> -Rework to 1.10.0 +Rebase to 1.13.0 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- - lang/python/setup.py.in | 10 +--------- - 1 file changed, 1 insertion(+), 9 deletions(-) + lang/python/setup.py.in | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in -index 2595073..60b5257 100755 +index 9785a28..006216d 100755 --- a/lang/python/setup.py.in +++ b/lang/python/setup.py.in -@@ -26,7 +26,6 @@ import shutil - import subprocess +@@ -30,7 +30,6 @@ import subprocess + import sys # Out-of-tree build of the gpg bindings. --gpg_error_config = ["gpg-error-config"] - gpgme_config_flags = ["--thread=pthread"] - gpgme_config = ["gpgme-config"] + gpgme_config_flags - gpgme_h = "" -@@ -157,14 +156,7 @@ class BuildExtFirstHack(build): +-gpg_error_config = ['gpg-error-config'] + gpgme_config_flags = ['--thread=pthread'] + gpgme_config = ['gpgme-config'] + gpgme_config_flags + gpgme_h = '' +@@ -182,15 +181,9 @@ class BuildExtFirstHack(build): def _generate_errors_i(self): - try: -- subprocess.check_call(gpg_error_config + ['--version'], -- stdout=devnull) +- subprocess.check_call( +- gpg_error_config + ['--version'], stdout=devnull) - except: -- sys.exit("Could not find gpg-error-config. " + -- "Please install the libgpg-error development package.") -- -- gpg_error_content = self._read_header("gpg-error.h", getconfig("cflags", config=gpg_error_config)) -+ gpg_error_content = self._read_header("gpg-error.h", os.environ.get('CFLAGS').split()) +- sys.exit('Could not find gpg-error-config. ' + +- 'Please install the libgpg-error development package.') + + gpg_error_content = self._read_header( +- 'gpg-error.h', getconfig('cflags', config=gpg_error_config)) ++ "gpg-error.h", os.environ.get('CFLAGS').split()) filter_re = re.compile(r'GPG_ERR_[^ ]* =') rewrite_re = re.compile(r' *(.*) = .*') diff --git a/external/poky/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch b/external/poky/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch index 330bec65..de1689ec 100644 --- a/external/poky/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch +++ b/external/poky/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch @@ -1,4 +1,4 @@ -From 60baf9ebf30bed0e2ee3c7c5a74d5b6d50035862 Mon Sep 17 00:00:00 2001 +From f632148fcc8757bb9a9601a6dab275e88cd309d2 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Tue, 30 Jan 2018 15:28:49 +0800 Subject: [PATCH 3/7] Correctly install python modules @@ -17,10 +17,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 1 insertion(+) diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am -index 8d74cbd..ce4f0a5 100644 +index 6988faf..36c6f7b 100644 --- a/lang/python/Makefile.am +++ b/lang/python/Makefile.am -@@ -91,6 +91,7 @@ install-exec-local: +@@ -93,6 +93,7 @@ install-exec-local: --build-base="$$(basename "$${PYTHON}")-gpg" \ install \ --prefix "$(DESTDIR)$(prefix)" \ diff --git a/external/poky/meta/recipes-support/gpgme/gpgme/0004-python-import.patch b/external/poky/meta/recipes-support/gpgme/gpgme/0004-python-import.patch index 1a60f79b..fa0eccfc 100644 --- a/external/poky/meta/recipes-support/gpgme/gpgme/0004-python-import.patch +++ b/external/poky/meta/recipes-support/gpgme/gpgme/0004-python-import.patch @@ -1,4 +1,4 @@ -From fd7dcceeee439eb479edbb418bab635343414ee6 Mon Sep 17 00:00:00 2001 +From f51bf1114bee6d56a950dcc6ebb46d6138b3faed Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Wed, 16 Aug 2017 02:06:45 -0400 Subject: [PATCH 4/7] python import diff --git a/external/poky/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch b/external/poky/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch index 2da79043..50bf2146 100644 --- a/external/poky/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch +++ b/external/poky/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch @@ -1,4 +1,4 @@ -From a58d90632a9907be3e8001800a143ac19075241a Mon Sep 17 00:00:00 2001 +From 8d9613c34ae495bbcbd725a2e7ac48138ba53c30 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Thu, 13 Apr 2017 16:40:27 +0300 Subject: [PATCH 5/7] gpgme-config: skip all /lib* or /usr/lib* directories in diff --git a/external/poky/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch b/external/poky/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch index 26ff4723..1471184d 100644 --- a/external/poky/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch +++ b/external/poky/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch @@ -1,4 +1,4 @@ -From 4f83750ce402b65d16cc09f8a0274a7ec76fc634 Mon Sep 17 00:00:00 2001 +From ef920688bfe1c7328c9e97229d62ccd35304ad84 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Wed, 31 Jan 2018 11:01:09 +0800 Subject: [PATCH 6/7] fix build path issue @@ -17,10 +17,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am -index ce4f0a5..5a468f1 100644 +index 36c6f7b..ce9a108 100644 --- a/lang/python/Makefile.am +++ b/lang/python/Makefile.am -@@ -90,8 +90,9 @@ install-exec-local: +@@ -92,8 +92,9 @@ install-exec-local: build \ --build-base="$$(basename "$${PYTHON}")-gpg" \ install \ diff --git a/external/poky/meta/recipes-support/gpgme/gpgme/0007-python-Add-variables-to-tests.patch b/external/poky/meta/recipes-support/gpgme/gpgme/0007-python-Add-variables-to-tests.patch new file mode 100644 index 00000000..4c97f63c --- /dev/null +++ b/external/poky/meta/recipes-support/gpgme/gpgme/0007-python-Add-variables-to-tests.patch @@ -0,0 +1,52 @@ +From 093c88817397425ee4c2333c469467229a46c9e1 Mon Sep 17 00:00:00 2001 +From: Yuan Chao <yuanc.fnst@cn.fujitsu.com> +Date: Mon, 5 Aug 2019 01:00:58 +0900 +Subject: [PATCH 7/7] python: Add variables to tests + +* configure.ac, lang/python/Makefile.am: + New variable to `lang/python', set to `lang/python' if RUN_LANG_PYTHON_TESTS + +Upstream-Status: Submitted [gnupg-devel@gnupg.org] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + +Signed-off-by: Yuan Chao <yuanc.fnst@cn.fujitsu.com> +--- + configure.ac | 5 +++++ + lang/python/Makefile.am | 3 +++ + 2 files changed, 8 insertions(+) + +diff --git a/configure.ac b/configure.ac +index bd85886..b5ae42e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -533,6 +533,11 @@ AC_ARG_ENABLE(g13-test, + run_g13_test=$enableval) + AM_CONDITIONAL(RUN_G13_TESTS, test "$run_g13_test" = "yes") + ++run_lang_python_test="yes" ++AC_ARG_ENABLE(lang-python-test, ++ AC_HELP_STRING([--disable-lang-python-test], [disable Python regression test]), ++ run_lang_python_test=$enableval) ++AM_CONDITIONAL(RUN_LANG_PYTHON_TESTS, test "$run_lang_python_test" = "yes") + + # Checks for header files. + AC_CHECK_HEADERS_ONCE([locale.h sys/select.h sys/uio.h argp.h stdint.h +diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am +index 551deee..0fd555e 100644 +--- a/lang/python/Makefile.am ++++ b/lang/python/Makefile.am +@@ -23,7 +23,10 @@ EXTRA_DIST = \ + gpgme.i \ + helpers.c helpers.h private.h + ++SUBDIRS = . examples doc src ++if RUN_LANG_PYTHON_TESTS + SUBDIRS = . tests examples doc src ++endif + + .PHONY: prepare + prepare: copystamp +-- +2.7.4 + diff --git a/external/poky/meta/recipes-support/gpgme/gpgme/0007-qt-python-Add-variables-to-tests.patch b/external/poky/meta/recipes-support/gpgme/gpgme/0007-qt-python-Add-variables-to-tests.patch deleted file mode 100644 index 63eeacf3..00000000 --- a/external/poky/meta/recipes-support/gpgme/gpgme/0007-qt-python-Add-variables-to-tests.patch +++ /dev/null @@ -1,78 +0,0 @@ -From d3087348348b4a7fcfb05bf2a75b4a63453e1c77 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Thu, 1 Feb 2018 10:14:30 +0800 -Subject: [PATCH 7/7] qt/python: Add variables to tests - -* configure.ac, lang/python/Makefile.am: - New variable to `lang/python', set to `lang/python' if RUN_LANG_PYTHON_TESTS - -* configure.ac, lang/qt/Makefile.am: - New variable to `lang/qt', set to `lang/qt' if RUN_LANG_QT_TESTS - -Upstream-Status: Submitted [gnupg-devel@gnupg.org] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - configure.ac | 11 +++++++++++ - lang/python/Makefile.am | 3 +++ - lang/qt/Makefile.am | 8 +++++++- - 3 files changed, 21 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 7485cdf..4aa216d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -535,6 +535,17 @@ AC_ARG_ENABLE(g13-test, - run_g13_test=$enableval) - AM_CONDITIONAL(RUN_G13_TESTS, test "$run_g13_test" = "yes") - -+run_lang_python_test="yes" -+AC_ARG_ENABLE(lang-python-test, -+ AC_HELP_STRING([--disable-lang-python-test], [disable Python regression test]), -+ run_lang_python_test=$enableval) -+AM_CONDITIONAL(RUN_LANG_PYTHON_TESTS, test "$run_lang_python_test" = "yes") -+ -+run_lang_qt_test="yes" -+AC_ARG_ENABLE(lang-qt-test, -+ AC_HELP_STRING([--disable-lang-qt-test], [disable Qt regression test]), -+ run_lang_qt_test=$enableval) -+AM_CONDITIONAL(RUN_LANG_QT_TESTS, test "$run_lang_qt_test" = "yes") - - # Checks for header files. - AC_CHECK_HEADERS_ONCE([locale.h sys/select.h sys/uio.h argp.h -diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am -index 5a468f1..43b9788 100644 ---- a/lang/python/Makefile.am -+++ b/lang/python/Makefile.am -@@ -24,7 +24,10 @@ EXTRA_DIST = \ - examples \ - src - -+if RUN_LANG_PYTHON_TESTS - SUBDIRS = . tests -+endif -+ - - .PHONY: prepare - prepare: copystamp -diff --git a/lang/qt/Makefile.am b/lang/qt/Makefile.am -index ab85960..a244ede 100644 ---- a/lang/qt/Makefile.am -+++ b/lang/qt/Makefile.am -@@ -19,6 +19,12 @@ - # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - # 02111-1307, USA - --SUBDIRS = src tests doc -+if RUN_LANG_QT_TESTS -+qttests = tests -+else -+qttests = -+endif -+ -+SUBDIRS = src ${qttests} doc - - EXTRA_DIST = README --- -2.7.4 - diff --git a/external/poky/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch b/external/poky/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch new file mode 100644 index 00000000..3afbfc86 --- /dev/null +++ b/external/poky/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch @@ -0,0 +1,36 @@ +From fc3d9cc218e60582fd158d21a1cd537a3dc1b007 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Fri, 10 May 2019 16:19:54 +0800 +Subject: [PATCH] do not auto check var-PYTHON + +Upstream auto check the version of python rather than specify option +[ff6ff61 python: Auto-check for all installed python versions.] + +In oe-core, don't check var-PYTHON, use the setting from recipe, +only check specific python 2.7 and 3.7 + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index cb2f073..7d74a6d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -423,8 +423,8 @@ if test "$found_py" = "1"; then + if test "$found_py" = "1" -o "$found_py3" = "1"; then + # Reset everything, so that we can look for another Python. + m4_foreach([mym4pythonver], +- [[2.7],[3.4],[3.5],[3.6],[3.7],[3.8],[all]], +- [unset PYTHON ++ [[2.7],[3.7]], ++ [ + unset PYTHON_VERSION + unset PYTHON_CPPFLAGS + unset PYTHON_LDFLAGS +-- +2.7.4 + diff --git a/external/poky/meta/recipes-support/gpgme/gpgme_1.11.1.bb b/external/poky/meta/recipes-support/gpgme/gpgme_1.13.1.bb index 86fae946..9fc1ae24 100644 --- a/external/poky/meta/recipes-support/gpgme/gpgme_1.11.1.bb +++ b/external/poky/meta/recipes-support/gpgme/gpgme_1.13.1.bb @@ -6,22 +6,24 @@ BUGTRACKER = "https://bugs.g10code.com/gnupg/index" LICENSE = "GPLv2+ & LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYING.LESSER;md5=bbb461211a33b134d42ed5ee802b37ff \ - file://src/gpgme.h.in;endline=23;md5=4d6319e587fd944adfe61a41a8f15b36 \ + file://src/gpgme.h.in;endline=23;md5=2f0bf06d1c7dcb28532a9d0f94a7ca1d \ file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \ + file://0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch \ file://0001-pkgconfig.patch \ file://0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch \ file://0003-Correctly-install-python-modules.patch \ file://0004-python-import.patch \ file://0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch \ file://0006-fix-build-path-issue.patch \ - file://0007-qt-python-Add-variables-to-tests.patch \ + file://0007-python-Add-variables-to-tests.patch \ + file://0008-do-not-auto-check-var-PYTHON.patch \ " -SRC_URI[md5sum] = "129c46fb85a7ffa41e43345e48aee884" -SRC_URI[sha256sum] = "2d1b111774d2e3dd26dcd7c251819ce4ef774ec5e566251eb9308fa7542fbd6f" +SRC_URI[md5sum] = "198f0a908ec3cd8f0ce9a4f3a4489645" +SRC_URI[sha256sum] = "c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46" DEPENDS = "libgpg-error libassuan" RDEPENDS_${PN}-cpp += "libstdc++" @@ -44,9 +46,7 @@ PACKAGECONFIG[python3] = ",,python3 swig-native," # support. Since these bindings are currently not needed, we can disable them. DEFAULT_LANGUAGES = "" DEFAULT_LANGUAGES_class-target = "cpp" -LANGUAGES ?= "${DEFAULT_LANGUAGES}" -LANGUAGES .= "${@bb.utils.contains('PACKAGECONFIG', 'python2', ' python2', '', d)}" -LANGUAGES .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', ' python3', '', d)}" +LANGUAGES ?= "${DEFAULT_LANGUAGES} python" PYTHON_INHERIT = "${@bb.utils.contains('PACKAGECONFIG', 'python2', 'pythonnative', '', d)}" PYTHON_INHERIT .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)}" @@ -56,7 +56,6 @@ EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \ --disable-gpg-test \ --disable-gpgsm-test \ --disable-g13-test \ - --disable-lang-qt-test \ --disable-lang-python-test \ ' |