mirror of
https://git.yoctoproject.org/poky
synced 2026-04-19 06:32:13 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
3e5ce0275a
commit
cdd35d07a2
@@ -25,19 +25,15 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \
|
||||
|
||||
SRC_URI[sha256sum] = "361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e"
|
||||
|
||||
DEPENDS = "libgpg-error libassuan"
|
||||
PYTHON_DEPS = "${@bb.utils.contains('LANGUAGES', 'python', 'swig-native', '', d)}"
|
||||
|
||||
DEPENDS = "libgpg-error libassuan ${PYTHON_DEPS}"
|
||||
RDEPENDS:${PN}-cpp += "libstdc++"
|
||||
|
||||
RDEPENDS:python2-gpg += "python-unixadmin"
|
||||
RDEPENDS:python3-gpg += "python3-unixadmin"
|
||||
|
||||
BINCONFIG = "${bindir}/gpgme-config"
|
||||
|
||||
# Note select python2 or python3, but you can't select both at the same time
|
||||
PACKAGECONFIG ??= "python3"
|
||||
PACKAGECONFIG[python2] = ",,python swig-native,"
|
||||
PACKAGECONFIG[python3] = ",,python3 swig-native,"
|
||||
|
||||
# Default in configure.ac: "cl cpp python qt"
|
||||
# Supported: "cl cpp python python2 python3 qt"
|
||||
# python says 'search and find python2 or python3'
|
||||
@@ -48,8 +44,7 @@ DEFAULT_LANGUAGES = ""
|
||||
DEFAULT_LANGUAGES:class-target = "cpp"
|
||||
LANGUAGES ?= "${DEFAULT_LANGUAGES} python"
|
||||
|
||||
PYTHON_INHERIT = "${@bb.utils.contains('PACKAGECONFIG', 'python2', 'pythonnative', '', d)}"
|
||||
PYTHON_INHERIT .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native python3targetconfig', '', d)}"
|
||||
PYTHON_INHERIT = "${@bb.utils.contains('LANGUAGES', 'python', 'setuptools3-base', '', d)}"
|
||||
|
||||
EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \
|
||||
--disable-gpgconf-test \
|
||||
@@ -59,18 +54,15 @@ EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \
|
||||
--disable-lang-python-test \
|
||||
'
|
||||
|
||||
inherit autotools texinfo binconfig-disabled pkgconfig setuptools3-base ${PYTHON_INHERIT} multilib_header
|
||||
inherit autotools texinfo binconfig-disabled pkgconfig ${PYTHON_INHERIT} python3native multilib_header
|
||||
|
||||
export PKG_CONFIG='pkg-config'
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
PACKAGES =+ "${PN}-cpp"
|
||||
PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python2-gpg ', '', d)}"
|
||||
PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-gpg ', '', d)}"
|
||||
PACKAGES =+ "${PN}-cpp python3-gpg"
|
||||
|
||||
FILES:${PN}-cpp = "${libdir}/libgpgmepp.so.*"
|
||||
FILES:python2-gpg = "${PYTHON_SITEPACKAGES_DIR}/*"
|
||||
FILES:python3-gpg = "${PYTHON_SITEPACKAGES_DIR}/*"
|
||||
FILES:${PN}-dev += "${datadir}/common-lisp/source/gpgme/*"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user