summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/gpgme/gpgme/0007-python-Add-variables-to-tests.patch52
-rw-r--r--meta/recipes-support/gpgme/gpgme_1.22.0.bb (renamed from meta/recipes-support/gpgme/gpgme_1.20.0.bb)4
2 files changed, 1 insertions, 55 deletions
diff --git a/meta/recipes-support/gpgme/gpgme/0007-python-Add-variables-to-tests.patch b/meta/recipes-support/gpgme/gpgme/0007-python-Add-variables-to-tests.patch
deleted file mode 100644
index 4c97f63cc2..0000000000
--- a/meta/recipes-support/gpgme/gpgme/0007-python-Add-variables-to-tests.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From 093c88817397425ee4c2333c469467229a46c9e1 Mon Sep 17 00:00:00 2001
2From: Yuan Chao <yuanc.fnst@cn.fujitsu.com>
3Date: Mon, 5 Aug 2019 01:00:58 +0900
4Subject: [PATCH 7/7] python: Add variables to tests
5
6* configure.ac, lang/python/Makefile.am:
7 New variable to `lang/python', set to `lang/python' if RUN_LANG_PYTHON_TESTS
8
9Upstream-Status: Submitted [gnupg-devel@gnupg.org]
10
11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12
13Signed-off-by: Yuan Chao <yuanc.fnst@cn.fujitsu.com>
14---
15 configure.ac | 5 +++++
16 lang/python/Makefile.am | 3 +++
17 2 files changed, 8 insertions(+)
18
19diff --git a/configure.ac b/configure.ac
20index bd85886..b5ae42e 100644
21--- a/configure.ac
22+++ b/configure.ac
23@@ -533,6 +533,11 @@ AC_ARG_ENABLE(g13-test,
24 run_g13_test=$enableval)
25 AM_CONDITIONAL(RUN_G13_TESTS, test "$run_g13_test" = "yes")
26
27+run_lang_python_test="yes"
28+AC_ARG_ENABLE(lang-python-test,
29+ AC_HELP_STRING([--disable-lang-python-test], [disable Python regression test]),
30+ run_lang_python_test=$enableval)
31+AM_CONDITIONAL(RUN_LANG_PYTHON_TESTS, test "$run_lang_python_test" = "yes")
32
33 # Checks for header files.
34 AC_CHECK_HEADERS_ONCE([locale.h sys/select.h sys/uio.h argp.h stdint.h
35diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
36index 551deee..0fd555e 100644
37--- a/lang/python/Makefile.am
38+++ b/lang/python/Makefile.am
39@@ -23,7 +23,10 @@ EXTRA_DIST = \
40 gpgme.i \
41 helpers.c helpers.h private.h
42
43+SUBDIRS = . examples doc src
44+if RUN_LANG_PYTHON_TESTS
45 SUBDIRS = . tests examples doc src
46+endif
47
48 .PHONY: prepare
49 prepare: copystamp
50--
512.7.4
52
diff --git a/meta/recipes-support/gpgme/gpgme_1.20.0.bb b/meta/recipes-support/gpgme/gpgme_1.22.0.bb
index dc5b58d7c3..84c8fa9f8a 100644
--- a/meta/recipes-support/gpgme/gpgme_1.20.0.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.22.0.bb
@@ -18,14 +18,13 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \
18 file://0004-python-import.patch \ 18 file://0004-python-import.patch \
19 file://0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch \ 19 file://0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch \
20 file://0006-fix-build-path-issue.patch \ 20 file://0006-fix-build-path-issue.patch \
21 file://0007-python-Add-variables-to-tests.patch \
22 file://0008-do-not-auto-check-var-PYTHON.patch \ 21 file://0008-do-not-auto-check-var-PYTHON.patch \
23 file://0001-use-closefrom-on-linux-and-glibc-2.34.patch \ 22 file://0001-use-closefrom-on-linux-and-glibc-2.34.patch \
24 file://0001-posix-io.c-Use-off_t-instead-of-off64_t.patch \ 23 file://0001-posix-io.c-Use-off_t-instead-of-off64_t.patch \
25 file://0001-autogen.sh-remove-unknown-in-version.patch \ 24 file://0001-autogen.sh-remove-unknown-in-version.patch \
26 " 25 "
27 26
28SRC_URI[sha256sum] = "25a5785a5da356689001440926b94e967d02e13c49eb7743e35ef0cf22e42750" 27SRC_URI[sha256sum] = "9551e37081ad3bde81018a0d24f245c3f8206990549598fb31a97a68380a7b71"
29 28
30PYTHON_DEPS = "${@bb.utils.contains('LANGUAGES', 'python', 'swig-native', '', d)}" 29PYTHON_DEPS = "${@bb.utils.contains('LANGUAGES', 'python', 'swig-native', '', d)}"
31 30
@@ -53,7 +52,6 @@ EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \
53 --disable-gpg-test \ 52 --disable-gpg-test \
54 --disable-gpgsm-test \ 53 --disable-gpgsm-test \
55 --disable-g13-test \ 54 --disable-g13-test \
56 --disable-lang-python-test \
57' 55'
58 56
59inherit autotools texinfo binconfig-disabled pkgconfig ${PYTHON_INHERIT} python3native multilib_header 57inherit autotools texinfo binconfig-disabled pkgconfig ${PYTHON_INHERIT} python3native multilib_header