summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2018-09-17 17:33:00 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-21 18:45:46 -0700
commit784a3f8198b47b02eaee8be99a31a8cae3c1a539 (patch)
tree5dab12b2f3895ebeb2e9a2b2732a1b1aa8b93f1e
parentb6eeccc881b2584be7b0d458f54626afc270883c (diff)
downloadpoky-784a3f8198b47b02eaee8be99a31a8cae3c1a539.tar.gz
gpgme: Inherit from distutils-common-base
Inherit from distutils-common-base and pythonnative/python3native to avoid runtime dependency on Python, whilst still fixing clang builds. Fixes: 8bfb54edc6fa ("gpgme: Inherit distutils3-base") Suggested-by: Khem Raj <raj.khem@gmail.com> (From OE-Core rev: 4e1e914101146149cbfd70ff00cfcd0fdcf1a88c) Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/gpgme/gpgme_1.11.1.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-support/gpgme/gpgme_1.11.1.bb b/meta/recipes-support/gpgme/gpgme_1.11.1.bb
index ac9fccf133..86fae94609 100644
--- a/meta/recipes-support/gpgme/gpgme_1.11.1.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.11.1.bb
@@ -48,8 +48,8 @@ LANGUAGES ?= "${DEFAULT_LANGUAGES}"
48LANGUAGES .= "${@bb.utils.contains('PACKAGECONFIG', 'python2', ' python2', '', d)}" 48LANGUAGES .= "${@bb.utils.contains('PACKAGECONFIG', 'python2', ' python2', '', d)}"
49LANGUAGES .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', ' python3', '', d)}" 49LANGUAGES .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', ' python3', '', d)}"
50 50
51PYTHON_INHERIT = "${@bb.utils.contains('PACKAGECONFIG', 'python2', ' distutils-base', '', d)}" 51PYTHON_INHERIT = "${@bb.utils.contains('PACKAGECONFIG', 'python2', 'pythonnative', '', d)}"
52PYTHON_INHERIT .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', ' distutils3-base', '', d)}" 52PYTHON_INHERIT .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)}"
53 53
54EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \ 54EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \
55 --disable-gpgconf-test \ 55 --disable-gpgconf-test \
@@ -60,7 +60,7 @@ EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \
60 --disable-lang-python-test \ 60 --disable-lang-python-test \
61' 61'
62 62
63inherit autotools texinfo binconfig-disabled pkgconfig ${PYTHON_INHERIT} 63inherit autotools texinfo binconfig-disabled pkgconfig distutils-common-base ${PYTHON_INHERIT}
64 64
65export PKG_CONFIG='pkg-config' 65export PKG_CONFIG='pkg-config'
66 66