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/0001-pkgconfig.patch10
-rw-r--r--meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch66
-rw-r--r--meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch27
-rw-r--r--meta/recipes-support/gpgme/gpgme/0004-python-import.patch6
-rw-r--r--meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch6
-rw-r--r--meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch37
-rw-r--r--meta/recipes-support/gpgme/gpgme/0007-qt-python-Add-variables-to-tests.patch78
-rw-r--r--meta/recipes-support/gpgme/gpgme_1.10.0.bb (renamed from meta/recipes-support/gpgme/gpgme_1.9.0.bb)15
8 files changed, 179 insertions, 66 deletions
diff --git a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch
index 14a43eeeeb..f1997e15a3 100644
--- a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch
+++ b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch
@@ -1,7 +1,7 @@
1From 8ae149035c97d27cd2c624704d1651806c53577e Mon Sep 17 00:00:00 2001 1From 265faf8fe0acaca2043a248a4df02b0868ffa6de Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org> 2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Wed, 16 Aug 2017 02:00:08 -0400 3Date: Wed, 16 Aug 2017 02:00:08 -0400
4Subject: [PATCH 1/5] pkgconfig 4Subject: [PATCH 1/4] pkgconfig
5 5
6Update gpgme to use pkgconfig instead of -config files since its 6Update gpgme to use pkgconfig instead of -config files since its
7simpler and less error prone when cross compiling. 7simpler and less error prone when cross compiling.
@@ -25,10 +25,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
25 create mode 100644 src/gpgme.pc.in 25 create mode 100644 src/gpgme.pc.in
26 26
27diff --git a/configure.ac b/configure.ac 27diff --git a/configure.ac b/configure.ac
28index 0dac6ce..6a9e507 100644 28index 6ea4bcd..2a0d528 100644
29--- a/configure.ac 29--- a/configure.ac
30+++ b/configure.ac 30+++ b/configure.ac
31@@ -866,6 +866,7 @@ AC_CONFIG_FILES(Makefile src/Makefile 31@@ -887,6 +887,7 @@ AC_CONFIG_FILES(Makefile src/Makefile
32 src/versioninfo.rc 32 src/versioninfo.rc
33 src/gpgme.h) 33 src/gpgme.h)
34 AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) 34 AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config)
@@ -299,5 +299,5 @@ index 0000000..b69539f
299+Requires: libassuan gpg-error 299+Requires: libassuan gpg-error
300\ No newline at end of file 300\ No newline at end of file
301-- 301--
3022.8.1 3021.8.3.1
303 303
diff --git a/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch b/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch
index f1f8c911fc..d20271e311 100644
--- a/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch
+++ b/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch
@@ -1,29 +1,28 @@
1From fb165c9bd96aca8c9ee3e4509c9b6e35d238ad2e Mon Sep 17 00:00:00 2001 1From 30f7a694cc4568ecb24f77c83a6123ed3f4075fa Mon Sep 17 00:00:00 2001
2From: Mark Hatle <mark.hatle@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 16 Aug 2017 02:02:47 -0400 3Date: Wed, 31 Jan 2018 10:44:19 +0800
4Subject: [PATCH 2/5] gpgme/lang/python: gpg-error-config should not be used. 4Subject: [PATCH] gpgme/lang/python: gpg-error-config should not be used
5 5
6gpg-error-config was modified by OE to always return an error. So we want 6gpg-error-config was modified by OE to always return an error.
7to find an alternative way to retrieve whatever it is we need. It turns 7So we want to find an alternative way to retrieve whatever it
8out that the system is just trying to find the path to the gpg-error.h, which 8is we need.
9we can pull in from the STAGING_INC environment.
10 9
11Upstream-Status: Inappropriate [changes are specific to OE] 10Upstream-Status: Inappropriate [changes are specific to OE]
12 11
13Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 12Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
14 13
15Rebase to 1.9.0 14Rework to 1.10.0
16 15
17Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 16Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
18--- 17---
19 lang/python/setup.py.in | 15 ++------------- 18 lang/python/setup.py.in | 10 +---------
20 1 file changed, 2 insertions(+), 13 deletions(-) 19 1 file changed, 1 insertion(+), 9 deletions(-)
21 20
22diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in 21diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in
23index bf4efa3..7c34487 100755 22index f9dda20..9f5d61f 100755
24--- a/lang/python/setup.py.in 23--- a/lang/python/setup.py.in
25+++ b/lang/python/setup.py.in 24+++ b/lang/python/setup.py.in
26@@ -24,7 +24,6 @@ import glob 25@@ -26,7 +26,6 @@ import shutil
27 import subprocess 26 import subprocess
28 27
29 # Out-of-tree build of the gpg bindings. 28 # Out-of-tree build of the gpg bindings.
@@ -31,35 +30,22 @@ index bf4efa3..7c34487 100755
31 gpgme_config_flags = ["--thread=pthread"] 30 gpgme_config_flags = ["--thread=pthread"]
32 gpgme_config = ["gpgme-config"] + gpgme_config_flags 31 gpgme_config = ["gpgme-config"] + gpgme_config_flags
33 gpgme_h = "" 32 gpgme_h = ""
34@@ -52,13 +51,6 @@ else: 33@@ -174,14 +173,7 @@ class BuildExtFirstHack(build):
35 devnull = open(os.devnull, "w")
36 34
37 try: 35 def _generate_errors_i(self):
38- subprocess.check_call(gpg_error_config + ['--version'],
39- stdout=devnull)
40-except:
41- sys.exit("Could not find gpg-error-config. " +
42- "Please install the libgpg-error development package.")
43-
44-try:
45 subprocess.check_call(gpgme_config + ['--version'],
46 stdout=devnull)
47 except:
48@@ -81,12 +73,9 @@ if not (major > 1 or (major == 1 and minor >= 7)):
49 if not gpgme_h:
50 gpgme_h = os.path.join(getconfig("prefix")[0], "include", "gpgme.h")
51
52-gpg_error_prefix = getconfig("prefix", config=gpg_error_config)[0]
53-gpg_error_h = os.path.join(gpg_error_prefix, "include", "gpg-error.h")
54+gpg_error_h = os.path.join(os.getenv('STAGING_INCDIR'), "gpg-error.h")
55 if not os.path.exists(gpg_error_h):
56- gpg_error_h = \
57- glob.glob(os.path.join(gpg_error_prefix, "include",
58- "*", "gpg-error.h"))[0]
59+ sys.exit("gpg_error_h not found: %s" % gpg_error_h)
60 36
61 print("Building python gpg module using {} and {}.".format(gpgme_h, gpg_error_h)) 37- try:
38- subprocess.check_call(gpg_error_config + ['--version'],
39- stdout=devnull)
40- except:
41- sys.exit("Could not find gpg-error-config. " +
42- "Please install the libgpg-error development package.")
43-
44- gpg_error_content = self._read_header("gpg-error.h", getconfig("cflags", config=gpg_error_config))
45+ gpg_error_content = self._read_header("gpg-error.h", os.environ.get('CFLAGS').split())
62 46
47 filter_re = re.compile(r'GPG_ERR_[^ ]* =')
48 rewrite_re = re.compile(r' *(.*) = .*')
63-- 49--
642.8.1 501.8.3.1
65 51
diff --git a/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch b/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch
index d38331171e..7c9cccc0ea 100644
--- a/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch
+++ b/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch
@@ -1,7 +1,7 @@
1From 62332eec752dd790f4dd071dfb0dbe86be377203 Mon Sep 17 00:00:00 2001 1From 93aae34ee70b8d50b31a19a65d6ac8290cb148ae Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 16 Aug 2017 02:05:34 -0400 3Date: Tue, 30 Jan 2018 15:28:49 +0800
4Subject: [PATCH 3/5] Correctly install python modules 4Subject: [PATCH 2/4] Correctly install python modules
5 5
6Upstream-Status: Inappropriate [oe-core specific] 6Upstream-Status: Inappropriate [oe-core specific]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
@@ -9,22 +9,25 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9Rebase to 1.9.0 9Rebase to 1.9.0
10 10
11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12
13Rebase to 1.10.0
14Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12--- 15---
13 lang/python/Makefile.am | 1 + 16 lang/python/Makefile.am | 1 +
14 1 file changed, 1 insertion(+) 17 1 file changed, 1 insertion(+)
15 18
16diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am 19diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
17index d91ead9..67f7cdc 100644 20index 8d74cbd..ce4f0a5 100644
18--- a/lang/python/Makefile.am 21--- a/lang/python/Makefile.am
19+++ b/lang/python/Makefile.am 22+++ b/lang/python/Makefile.am
20@@ -106,6 +106,7 @@ install-exec-local: 23@@ -91,6 +91,7 @@ install-exec-local:
21 cd python$${VERSION}-gpg ; \ 24 --build-base="$$(basename "$${PYTHON}")-gpg" \
22 $$PYTHON setup.py install \ 25 install \
23 --prefix $(DESTDIR)$(prefix) \ 26 --prefix "$(DESTDIR)$(prefix)" \
24+ --install-lib=$(DESTDIR)${pythondir} \ 27+ --install-lib=$(DESTDIR)${pythondir} \
25 --record files.txt \
26 --verbose ; \ 28 --verbose ; \
27 cat files.txt >> ../install_files.txt ; \ 29 done
30
28-- 31--
292.8.1 321.8.3.1
30 33
diff --git a/meta/recipes-support/gpgme/gpgme/0004-python-import.patch b/meta/recipes-support/gpgme/gpgme/0004-python-import.patch
index 93071030f9..d2b039dacd 100644
--- a/meta/recipes-support/gpgme/gpgme/0004-python-import.patch
+++ b/meta/recipes-support/gpgme/gpgme/0004-python-import.patch
@@ -1,7 +1,7 @@
1From ccbf028eea8815d3b16d6c34b527253a6b108ec3 Mon Sep 17 00:00:00 2001 1From 32ecc3f058307060e40af86127cd226248a73c41 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com> 2From: Ross Burton <ross.burton@intel.com>
3Date: Wed, 16 Aug 2017 02:06:45 -0400 3Date: Wed, 16 Aug 2017 02:06:45 -0400
4Subject: [PATCH 4/5] python import 4Subject: [PATCH 3/4] python import
5 5
6Don't check for output on stderr to know if an import worked, host inputrc and 6Don't check for output on stderr to know if an import worked, host inputrc and
7sysroot readline can cause warnings on stderr. 7sysroot readline can cause warnings on stderr.
@@ -30,5 +30,5 @@ index b990d5b..318b089 100644
30 else 30 else
31 AC_MSG_RESULT([no]) 31 AC_MSG_RESULT([no])
32-- 32--
332.8.1 331.8.3.1
34 34
diff --git a/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch b/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch
index 7a6cc7b84d..963ae874ca 100644
--- a/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch
+++ b/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch
@@ -1,7 +1,7 @@
1From 064ae4441e2c11329748a18157988f9e953f9752 Mon Sep 17 00:00:00 2001 1From 6dcedc4dd055af902719b1a1cb10daa935a27f58 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 13 Apr 2017 16:40:27 +0300 3Date: Thu, 13 Apr 2017 16:40:27 +0300
4Subject: [PATCH 5/5] gpgme-config: skip all /lib* or /usr/lib* directories in 4Subject: [PATCH 4/4] gpgme-config: skip all /lib* or /usr/lib* directories in
5 output 5 output
6 6
7The logic was not working in multilib setups which use other 7The logic was not working in multilib setups which use other
@@ -27,5 +27,5 @@ index a4d152e..8342865 100644
27 ;; 27 ;;
28 -L*|-l*) 28 -L*|-l*)
29-- 29--
302.8.1 301.8.3.1
31 31
diff --git a/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch b/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch
new file mode 100644
index 0000000000..8cc8983e27
--- /dev/null
+++ b/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch
@@ -0,0 +1,37 @@
1From 180a5669e4a13a550b1b0dcef1689b6c0470fe54 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 31 Jan 2018 11:01:09 +0800
4Subject: [PATCH] fix build path issue
5
6Get the "--root" directory supplied to the "install" command,
7and use it as a prefix to strip off the purported filename
8encoded in bytecode files.
9
10Since --root added, we need to tweak --prefix and --install-lib
11to use relative path.
12
13Upstream-Status: Submitted [gnupg-devel@gnupg.org]
14Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15---
16 lang/python/Makefile.am | 5 +++--
17 1 file changed, 3 insertions(+), 2 deletions(-)
18
19diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
20index ce4f0a5..5a468f1 100644
21--- a/lang/python/Makefile.am
22+++ b/lang/python/Makefile.am
23@@ -90,8 +90,9 @@ install-exec-local:
24 build \
25 --build-base="$$(basename "$${PYTHON}")-gpg" \
26 install \
27- --prefix "$(DESTDIR)$(prefix)" \
28- --install-lib=$(DESTDIR)${pythondir} \
29+ --root=${DESTDIR} \
30+ --prefix "$(prefix)" \
31+ --install-lib=${pythondir} \
32 --verbose ; \
33 done
34
35--
361.8.3.1
37
diff --git a/meta/recipes-support/gpgme/gpgme/0007-qt-python-Add-variables-to-tests.patch b/meta/recipes-support/gpgme/gpgme/0007-qt-python-Add-variables-to-tests.patch
new file mode 100644
index 0000000000..ce3745cca0
--- /dev/null
+++ b/meta/recipes-support/gpgme/gpgme/0007-qt-python-Add-variables-to-tests.patch
@@ -0,0 +1,78 @@
1From f47e8c6f9e461803468a64581d3640d873352eaa Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Thu, 1 Feb 2018 10:14:30 +0800
4Subject: [PATCH] qt/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
9* configure.ac, lang/qt/Makefile.am:
10 New variable to `lang/qt', set to `lang/qt' if RUN_LANG_QT_TESTS
11
12Upstream-Status: Submitted [gnupg-devel@gnupg.org]
13
14Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15---
16 configure.ac | 11 +++++++++++
17 lang/python/Makefile.am | 3 +++
18 lang/qt/Makefile.am | 8 +++++++-
19 3 files changed, 21 insertions(+), 1 deletion(-)
20
21diff --git a/configure.ac b/configure.ac
22index 608c376..fad7467 100644
23--- a/configure.ac
24+++ b/configure.ac
25@@ -536,6 +536,17 @@ AC_ARG_ENABLE(g13-test,
26 run_g13_test=$enableval)
27 AM_CONDITIONAL(RUN_G13_TESTS, test "$run_g13_test" = "yes")
28
29+run_lang_python_test="yes"
30+AC_ARG_ENABLE(lang-python-test,
31+ AC_HELP_STRING([--disable-lang-python-test], [disable Python regression test]),
32+ run_lang_python_test=$enableval)
33+AM_CONDITIONAL(RUN_LANG_PYTHON_TESTS, test "$run_lang_python_test" = "yes")
34+
35+run_lang_qt_test="yes"
36+AC_ARG_ENABLE(lang-qt-test,
37+ AC_HELP_STRING([--disable-lang-qt-test], [disable Qt regression test]),
38+ run_lang_qt_test=$enableval)
39+AM_CONDITIONAL(RUN_LANG_QT_TESTS, test "$run_lang_qt_test" = "yes")
40
41 # Checks for header files.
42 AC_CHECK_HEADERS_ONCE([locale.h sys/select.h sys/uio.h argp.h
43diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
44index 8d74cbd..43b5d1e 100644
45--- a/lang/python/Makefile.am
46+++ b/lang/python/Makefile.am
47@@ -24,7 +24,10 @@ EXTRA_DIST = \
48 examples \
49 src
50
51+if RUN_LANG_PYTHON_TESTS
52 SUBDIRS = . tests
53+endif
54+
55
56 .PHONY: prepare
57 prepare: copystamp
58diff --git a/lang/qt/Makefile.am b/lang/qt/Makefile.am
59index ab85960..a244ede 100644
60--- a/lang/qt/Makefile.am
61+++ b/lang/qt/Makefile.am
62@@ -19,6 +19,12 @@
63 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
64 # 02111-1307, USA
65
66-SUBDIRS = src tests doc
67+if RUN_LANG_QT_TESTS
68+qttests = tests
69+else
70+qttests =
71+endif
72+
73+SUBDIRS = src ${qttests} doc
74
75 EXTRA_DIST = README
76--
771.8.3.1
78
diff --git a/meta/recipes-support/gpgme/gpgme_1.9.0.bb b/meta/recipes-support/gpgme/gpgme_1.10.0.bb
index 065c34663c..f015f3ad75 100644
--- a/meta/recipes-support/gpgme/gpgme_1.9.0.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.10.0.bb
@@ -16,10 +16,12 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \
16 file://0003-Correctly-install-python-modules.patch \ 16 file://0003-Correctly-install-python-modules.patch \
17 file://0004-python-import.patch \ 17 file://0004-python-import.patch \
18 file://0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch \ 18 file://0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch \
19 file://0006-fix-build-path-issue.patch \
20 file://0007-qt-python-Add-variables-to-tests.patch \
19 " 21 "
20 22
21SRC_URI[md5sum] = "1e00bb8ef04d1d05d5a0f19e143854c3" 23SRC_URI[md5sum] = "78b1533c593478982ee2fc548260c563"
22SRC_URI[sha256sum] = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb" 24SRC_URI[sha256sum] = "1a8fed1197c3b99c35f403066bb344a26224d292afc048cfdfc4ccd5690a0693"
23 25
24DEPENDS = "libgpg-error libassuan" 26DEPENDS = "libgpg-error libassuan"
25RDEPENDS_${PN}-cpp += "libstdc++" 27RDEPENDS_${PN}-cpp += "libstdc++"
@@ -49,7 +51,14 @@ LANGUAGES .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', ' python3', '', d
49PYTHON_INHERIT = "${@bb.utils.contains('PACKAGECONFIG', 'python2', 'pythonnative', '', d)}" 51PYTHON_INHERIT = "${@bb.utils.contains('PACKAGECONFIG', 'python2', 'pythonnative', '', d)}"
50PYTHON_INHERIT .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)}" 52PYTHON_INHERIT .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)}"
51 53
52EXTRA_OECONF += '--enable-languages="${LANGUAGES}"' 54EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \
55 --disable-gpgconf-test \
56 --disable-gpg-test \
57 --disable-gpgsm-test \
58 --disable-g13-test \
59 --disable-lang-qt-test \
60 --disable-lang-python-test \
61'
53 62
54inherit autotools texinfo binconfig-disabled pkgconfig ${PYTHON_INHERIT} 63inherit autotools texinfo binconfig-disabled pkgconfig ${PYTHON_INHERIT}
55 64
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-11 20:38:02 +0000