diff options
| -rw-r--r-- | meta/recipes-support/gpgme/gpgme/python-lang-config.patch | 52 | ||||
| -rw-r--r-- | meta/recipes-support/gpgme/gpgme_1.8.0.bb | 28 |
2 files changed, 79 insertions, 1 deletions
diff --git a/meta/recipes-support/gpgme/gpgme/python-lang-config.patch b/meta/recipes-support/gpgme/gpgme/python-lang-config.patch new file mode 100644 index 0000000000..132e42677f --- /dev/null +++ b/meta/recipes-support/gpgme/gpgme/python-lang-config.patch @@ -0,0 +1,52 @@ +gpgme/lang/python: gpg-error-config should not be used. + +gpg-error-config was modified by OE to always return an error. So we want +to find an alternative way to retrieve whatever it is we need. It turns +out that the system is just trying to find the path to the gpg-error.h, which +we can pull in from the STAGING_INC environment. + +Upstream-Status: Inappropriate [changes are specific to OE] + +Signed-off-by: Mark Hatle <mark.hatle@windriver.com> + +Index: gpgme-1.8.0/lang/python/setup.py.in +=================================================================== +--- gpgme-1.8.0.orig/lang/python/setup.py.in ++++ gpgme-1.8.0/lang/python/setup.py.in +@@ -24,7 +24,6 @@ import glob + import subprocess + + # Out-of-tree build of the gpg bindings. +-gpg_error_config = ["gpg-error-config"] + gpgme_config_flags = ["--thread=pthread"] + gpgme_config = ["gpgme-config"] + gpgme_config_flags + gpgme_h = "" +@@ -52,13 +51,6 @@ else: + devnull = open(os.devnull, "w") + + try: +- subprocess.check_call(gpg_error_config + ['--version'], +- stdout=devnull) +-except: +- sys.exit("Could not find gpg-error-config. " + +- "Please install the libgpg-error development package.") +- +-try: + subprocess.check_call(gpgme_config + ['--version'], + stdout=devnull) + except: +@@ -81,12 +73,9 @@ if not (major > 1 or (major == 1 and min + if not gpgme_h: + gpgme_h = os.path.join(getconfig("prefix")[0], "include", "gpgme.h") + +-gpg_error_prefix = getconfig("prefix", config=gpg_error_config)[0] +-gpg_error_h = os.path.join(gpg_error_prefix, "include", "gpg-error.h") ++gpg_error_h = os.path.join(os.getenv('STAGING_INCDIR'), "gpg-error.h") + if not os.path.exists(gpg_error_h): +- gpg_error_h = \ +- glob.glob(os.path.join(gpg_error_prefix, "include", +- "*", "gpg-error.h"))[0] ++ sys.exit("gpg_error_h not found: %s" % gpg_error_h) + + print("Building python gpg module using {} and {}.".format(gpgme_h, gpg_error_h)) + diff --git a/meta/recipes-support/gpgme/gpgme_1.8.0.bb b/meta/recipes-support/gpgme/gpgme_1.8.0.bb index 3e74b6fe97..728e247a18 100644 --- a/meta/recipes-support/gpgme/gpgme_1.8.0.bb +++ b/meta/recipes-support/gpgme/gpgme_1.8.0.bb @@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \ file://pkgconfig.patch \ + file://python-lang-config.patch \ " SRC_URI[md5sum] = "722a4153904b9b5dc15485a22d29263b" @@ -22,12 +23,37 @@ RDEPENDS_${PN}-cpp += "libstdc++" BINCONFIG = "${bindir}/gpgme-config" -inherit autotools texinfo binconfig-disabled pkgconfig +# 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' + +LANGUAGES ?= "cpp" +LANGUAGES .= "${@bb.utils.contains('PACKAGECONFIG', 'python2', ' python2', '', d)}" +LANGUAGES .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', ' python3', '', d)}" + +PYTHON_INHERIT = "${@bb.utils.contains('PACKAGECONFIG', 'python2', 'pythonnative', '', d)}" +PYTHON_INHERIT .= "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)}" + +EXTRA_OECONF += '--enable-languages="${LANGUAGES}"' + +inherit autotools texinfo binconfig-disabled pkgconfig ${PYTHON_INHERIT} + +export PKG_CONFIG='pkg-config' BBCLASSEXTEND = "native" PACKAGES =+ "${PN}-cpp" +PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python2-gpg ', '', d)}" +PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-gpg ', '', d)}" + 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/* \ ${libdir}/cmake/* \ " |