diff options
-rw-r--r-- | meta/classes/gobject-introspection.bbclass | 5 | ||||
-rw-r--r-- | meta/classes/python3native.bbclass | 8 | ||||
-rw-r--r-- | meta/classes/pythonnative.bbclass | 8 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 1 | ||||
-rw-r--r-- | meta/recipes-core/libxml/libxml2_2.9.4.bb | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3-dbus_1.2.4.bb | 4 | ||||
-rw-r--r-- | meta/recipes-extended/libuser/libuser_0.62.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/newt/libnewt_0.52.19.bb | 2 | ||||
-rw-r--r-- | meta/recipes-gnome/gobject-introspection/gobject-introspection_1.48.0.bb | 7 | ||||
-rw-r--r-- | meta/recipes-kernel/perf/perf.bb | 2 | ||||
-rw-r--r-- | meta/recipes-support/libcap-ng/libcap-ng_0.7.7.bb | 3 |
11 files changed, 17 insertions, 29 deletions
diff --git a/meta/classes/gobject-introspection.bbclass b/meta/classes/gobject-introspection.bbclass index 8cd7b7ed50..37389cbc8b 100644 --- a/meta/classes/gobject-introspection.bbclass +++ b/meta/classes/gobject-introspection.bbclass @@ -24,11 +24,6 @@ DEPENDS_append_class-target = " gobject-introspection gobject-introspection-nati DEPENDS_append_class-native = " gobject-introspection-native" DEPENDS_append_class-nativesdk = " gobject-introspection-native" -# This is necessary for python scripts to succeed - distutils fails if these -# are not set -export STAGING_INCDIR -export STAGING_LIBDIR - # This is used by introspection tools to find .gir includes export XDG_DATA_DIRS = "${STAGING_DATADIR}" diff --git a/meta/classes/python3native.bbclass b/meta/classes/python3native.bbclass index 18998636b4..d7b2d357e9 100644 --- a/meta/classes/python3native.bbclass +++ b/meta/classes/python3native.bbclass @@ -3,3 +3,11 @@ inherit python3-dir PYTHON="${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}" EXTRANATIVEPATH += "${PYTHON_PN}-native" DEPENDS += " ${PYTHON_PN}-native " + +# python-config and other scripts are using distutils modules +# which we patch to access these variables +export STAGING_INCDIR +export STAGING_LIBDIR + +# autoconf macros will use their internal default preference otherwise +export PYTHON diff --git a/meta/classes/pythonnative.bbclass b/meta/classes/pythonnative.bbclass index 97029dc525..bd239fa792 100644 --- a/meta/classes/pythonnative.bbclass +++ b/meta/classes/pythonnative.bbclass @@ -6,3 +6,11 @@ PYTHON="${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}" PYTHON_EXECUTABLE="${PYTHON}" EXTRANATIVEPATH += "${PYTHON_PN}-native" DEPENDS += " ${PYTHON_PN}-native " + +# python-config and other scripts are using distutils modules +# which we patch to access these variables +export STAGING_INCDIR +export STAGING_LIBDIR + +# autoconf macros will use their internal default preference otherwise +export PYTHON diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index c6b8e57e7d..c2ccedaeff 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -77,6 +77,7 @@ do_install_append () { fi # Remove some unpackaged files + rm -rf ${D}${datadir}/glib-2.0/codegen/__pycache__ rm -f ${D}${datadir}/glib-2.0/codegen/*.pyc rm -f ${D}${datadir}/glib-2.0/codegen/*.pyo diff --git a/meta/recipes-core/libxml/libxml2_2.9.4.bb b/meta/recipes-core/libxml/libxml2_2.9.4.bb index 5ff508a5ce..e2febf0c60 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.4.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.4.bb @@ -47,10 +47,6 @@ EXTRA_OECONF_class-native = "--without-legacy --without-docbook --with-c14n --wi EXTRA_OECONF_class-nativesdk = "--without-legacy --without-docbook --with-c14n --without-lzma --with-zlib" EXTRA_OECONF_linuxstdbase = "--with-debug --with-legacy --with-docbook --with-c14n --without-lzma --with-zlib" -# required for python binding -export STAGING_LIBDIR -export STAGING_INCDIR - python populate_packages_prepend () { # autonamer would call this libxml2-2, but we don't want that if d.getVar('DEBIAN_NAMES', True): diff --git a/meta/recipes-devtools/python/python3-dbus_1.2.4.bb b/meta/recipes-devtools/python/python3-dbus_1.2.4.bb index 759512c396..de5a01c7f2 100644 --- a/meta/recipes-devtools/python/python3-dbus_1.2.4.bb +++ b/meta/recipes-devtools/python/python3-dbus_1.2.4.bb @@ -18,10 +18,6 @@ PACKAGECONFIG ?= "" PACKAGECONFIG[docs] = "--enable-html-docs,--disable-html-docs,python3-docutils-native" PACKAGECONFIG[api-docs] = "--enable-api-docs,--disable-api-docs,python3-docutils-native python3-epydoc-native" -do_configure_prepend() { - export PYTHON=${PYTHON} -} - RDEPENDS_${PN} = "python3-io python3-logging python3-stringold python3-threading python3-xml" FILES_${PN}-dev += "${libdir}/pkgconfig" diff --git a/meta/recipes-extended/libuser/libuser_0.62.bb b/meta/recipes-extended/libuser/libuser_0.62.bb index 85905630a2..960f789e27 100644 --- a/meta/recipes-extended/libuser/libuser_0.62.bb +++ b/meta/recipes-extended/libuser/libuser_0.62.bb @@ -24,8 +24,6 @@ DEPENDS = "popt libpam glib-2.0 docbook-utils-native linuxdoc-tools-native pytho inherit autotools gettext python3native python3-dir pkgconfig -export PYTHON - EXTRA_OEMAKE = "PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}" PACKAGES += "${PN}-python " diff --git a/meta/recipes-extended/newt/libnewt_0.52.19.bb b/meta/recipes-extended/newt/libnewt_0.52.19.bb index b45461cde3..22bdaf5ab1 100644 --- a/meta/recipes-extended/newt/libnewt_0.52.19.bb +++ b/meta/recipes-extended/newt/libnewt_0.52.19.bb @@ -35,8 +35,6 @@ inherit autotools-brokensep CLEANBROKEN = "1" -export STAGING_INCDIR -export STAGING_LIBDIR export CPPFLAGS PACKAGES_prepend = "whiptail " diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.48.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.48.0.bb index 8adede66a5..6948aff2fa 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.48.0.bb +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.48.0.bb @@ -21,13 +21,6 @@ SRC_URI[sha256sum] = "fa275aaccdbfc91ec0bc9a6fd0562051acdba731e7d584b64a277fec60 inherit autotools pkgconfig gtk-doc python3native qemu gobject-introspection-data BBCLASSEXTEND = "native" -# necessary to let the call for python-config from configure.ac succeed -export STAGING_INCDIR -export STAGING_LIBDIR - -# autoconf macros otherwise will default to Python 2 -export PYTHON - # needed for writing out the qemu wrapper script export STAGING_DIR_HOST export B diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index d6683006fc..171d23f454 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -40,8 +40,6 @@ inherit linux-kernel-base kernel-arch pythonnative # needed for building the tools/perf Python bindings inherit python-dir -export STAGING_INCDIR -export STAGING_LIBDIR export PYTHON_SITEPACKAGES_DIR #kernel 3.1+ supports WERROR to disable warnings as errors diff --git a/meta/recipes-support/libcap-ng/libcap-ng_0.7.7.bb b/meta/recipes-support/libcap-ng/libcap-ng_0.7.7.bb index 5608f495e6..a38a818c03 100644 --- a/meta/recipes-support/libcap-ng/libcap-ng_0.7.7.bb +++ b/meta/recipes-support/libcap-ng/libcap-ng_0.7.7.bb @@ -17,9 +17,6 @@ SRC_URI[sha256sum] = "615549ce39b333f6b78baee0c0b4ef18bc726c6bf1cca123dfd89dd963 DEPENDS += "swig-native python3" -export PYTHON -export STAGING_INCDIR -export STAGING_LIBDIR EXTRA_OECONF += "--with-python --with-python3" EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}${PYTHON_ABI}' PYINC='${STAGING_INCDIR}/${PYLIBVER}'" |