diff options
author | David Bagonyi <david.bagonyi@gmail.com> | 2022-11-11 15:39:57 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-11-14 16:19:43 +0000 |
commit | cdd35d07a289637f33c5cb503feac51389c6fee0 (patch) | |
tree | 40cef39ffe358df284e65f07411a38c443a540c0 /meta/recipes-support/gpgme | |
parent | 3e5ce0275a43202cfe9fc5e3e1bdf8c3e7998a62 (diff) | |
download | poky-cdd35d07a289637f33c5cb503feac51389c6fee0.tar.gz |
gpgme: Allow setuptools3-base to be excluded from the inherit list
Inheriting setuptools3-base adds a runtime dependency on Python.
This change makes inheriting setuptools3-base optional. If one does not want
a runtime dependency on Python, they can remove python from LANGUAGES.
Additionally, as Python 2 has been EOL for nearly 3 years now, all Python 2 related parts have been taken out.
(From OE-Core rev: 1e2381d870b81813d3e9841fc207ac1cfa388386)
Signed-off-by: David Bagonyi <david.bagonyi@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gpgme')
-rw-r--r-- | meta/recipes-support/gpgme/gpgme_1.18.0.bb | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/meta/recipes-support/gpgme/gpgme_1.18.0.bb b/meta/recipes-support/gpgme/gpgme_1.18.0.bb index ca9c6cab14..40c41876fa 100644 --- a/meta/recipes-support/gpgme/gpgme_1.18.0.bb +++ b/meta/recipes-support/gpgme/gpgme_1.18.0.bb | |||
@@ -25,19 +25,15 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \ | |||
25 | 25 | ||
26 | SRC_URI[sha256sum] = "361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e" | 26 | SRC_URI[sha256sum] = "361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e" |
27 | 27 | ||
28 | DEPENDS = "libgpg-error libassuan" | 28 | PYTHON_DEPS = "${@bb.utils.contains('LANGUAGES', 'python', 'swig-native', '', d)}" |
29 | |||
30 | DEPENDS = "libgpg-error libassuan ${PYTHON_DEPS}" | ||
29 | RDEPENDS:${PN}-cpp += "libstdc++" | 31 | RDEPENDS:${PN}-cpp += "libstdc++" |
30 | 32 | ||
31 | RDEPENDS:python2-gpg += "python-unixadmin" | ||
32 | RDEPENDS:python3-gpg += "python3-unixadmin" | 33 | RDEPENDS:python3-gpg += "python3-unixadmin" |
33 | 34 | ||
34 | BINCONFIG = "${bindir}/gpgme-config" | 35 | BINCONFIG = "${bindir}/gpgme-config" |
35 | 36 | ||
36 | # Note select python2 or python3, but you can't select both at the same time | ||
37 | PACKAGECONFIG ??= "python3" | ||
38 | PACKAGECONFIG[python2] = ",,python swig-native," | ||
39 | PACKAGECONFIG[python3] = ",,python3 swig-native," | ||
40 | |||
41 | # Default in configure.ac: "cl cpp python qt" | 37 | # Default in configure.ac: "cl cpp python qt" |
42 | # Supported: "cl cpp python python2 python3 qt" | 38 | # Supported: "cl cpp python python2 python3 qt" |
43 | # python says 'search and find python2 or python3' | 39 | # python says 'search and find python2 or python3' |
@@ -48,8 +44,7 @@ DEFAULT_LANGUAGES = "" | |||
48 | DEFAULT_LANGUAGES:class-target = "cpp" | 44 | DEFAULT_LANGUAGES:class-target = "cpp" |
49 | LANGUAGES ?= "${DEFAULT_LANGUAGES} python" | 45 | LANGUAGES ?= "${DEFAULT_LANGUAGES} python" |
50 | 46 | ||
51 | PYTHON_INHERIT = "${@bb.utils.contains('PACKAGECONFIG', 'python2', 'pythonnative', '', d)}" | 47 | PYTHON_INHERIT = "${@bb.utils.contains('LANGUAGES', 'python', 'setuptools3-base', '', d)}" |
52 | PYTHON_INHERIT .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native python3targetconfig', '', d)}" | ||
53 | 48 | ||
54 | EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \ | 49 | EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \ |
55 | --disable-gpgconf-test \ | 50 | --disable-gpgconf-test \ |
@@ -59,18 +54,15 @@ EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \ | |||
59 | --disable-lang-python-test \ | 54 | --disable-lang-python-test \ |
60 | ' | 55 | ' |
61 | 56 | ||
62 | inherit autotools texinfo binconfig-disabled pkgconfig setuptools3-base ${PYTHON_INHERIT} multilib_header | 57 | inherit autotools texinfo binconfig-disabled pkgconfig ${PYTHON_INHERIT} python3native multilib_header |
63 | 58 | ||
64 | export PKG_CONFIG='pkg-config' | 59 | export PKG_CONFIG='pkg-config' |
65 | 60 | ||
66 | BBCLASSEXTEND = "native nativesdk" | 61 | BBCLASSEXTEND = "native nativesdk" |
67 | 62 | ||
68 | PACKAGES =+ "${PN}-cpp" | 63 | PACKAGES =+ "${PN}-cpp python3-gpg" |
69 | PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python2-gpg ', '', d)}" | ||
70 | PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-gpg ', '', d)}" | ||
71 | 64 | ||
72 | FILES:${PN}-cpp = "${libdir}/libgpgmepp.so.*" | 65 | FILES:${PN}-cpp = "${libdir}/libgpgmepp.so.*" |
73 | FILES:python2-gpg = "${PYTHON_SITEPACKAGES_DIR}/*" | ||
74 | FILES:python3-gpg = "${PYTHON_SITEPACKAGES_DIR}/*" | 66 | FILES:python3-gpg = "${PYTHON_SITEPACKAGES_DIR}/*" |
75 | FILES:${PN}-dev += "${datadir}/common-lisp/source/gpgme/*" | 67 | FILES:${PN}-dev += "${datadir}/common-lisp/source/gpgme/*" |
76 | 68 | ||