From 4e1e914101146149cbfd70ff00cfcd0fdcf1a88c Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Mon, 17 Sep 2018 17:33:00 +0000 Subject: 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 Signed-off-by: Alex Kiernan Signed-off-by: Ross Burton --- meta/recipes-support/gpgme/gpgme_1.11.1.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/recipes-support/gpgme') 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}" LANGUAGES .= "${@bb.utils.contains('PACKAGECONFIG', 'python2', ' python2', '', d)}" LANGUAGES .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', ' python3', '', d)}" -PYTHON_INHERIT = "${@bb.utils.contains('PACKAGECONFIG', 'python2', ' distutils-base', '', d)}" -PYTHON_INHERIT .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', ' distutils3-base', '', d)}" +PYTHON_INHERIT = "${@bb.utils.contains('PACKAGECONFIG', 'python2', 'pythonnative', '', d)}" +PYTHON_INHERIT .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)}" EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \ --disable-gpgconf-test \ @@ -60,7 +60,7 @@ EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \ --disable-lang-python-test \ ' -inherit autotools texinfo binconfig-disabled pkgconfig ${PYTHON_INHERIT} +inherit autotools texinfo binconfig-disabled pkgconfig distutils-common-base ${PYTHON_INHERIT} export PKG_CONFIG='pkg-config' -- cgit 1.2.3-korg