diff options
16 files changed, 2 insertions, 37 deletions
diff --git a/meta-efl/recipes-devtools/python/python-edbus.inc b/meta-efl/recipes-devtools/python/python-edbus.inc index 3e72261e22..cc60083874 100644 --- a/meta-efl/recipes-devtools/python/python-edbus.inc +++ b/meta-efl/recipes-devtools/python/python-edbus.inc | |||
| @@ -8,10 +8,6 @@ AUTHOR = "Gustavo Sverzut Barbieri <barbieri@gmail.com>" | |||
| 8 | DEPENDS = "python-cython-native python-pyrex-native python-numeric eina edbus python-dbus" | 8 | DEPENDS = "python-cython-native python-pyrex-native python-numeric eina edbus python-dbus" |
| 9 | RDEPENDS_${PN} += "python-lang python-dbus" | 9 | RDEPENDS_${PN} += "python-lang python-dbus" |
| 10 | 10 | ||
| 11 | # necessary to let the call for python-config succeed | ||
| 12 | export BUILD_SYS | ||
| 13 | export HOST_SYS | ||
| 14 | |||
| 15 | inherit e-base autotools pkgconfig distutils-base | 11 | inherit e-base autotools pkgconfig distutils-base |
| 16 | 12 | ||
| 17 | SRCNAME = "python-e_dbus" | 13 | SRCNAME = "python-e_dbus" |
diff --git a/meta-efl/recipes-devtools/python/python-efl.inc b/meta-efl/recipes-devtools/python/python-efl.inc index 92a26eddba..6837dab9fe 100644 --- a/meta-efl/recipes-devtools/python/python-efl.inc +++ b/meta-efl/recipes-devtools/python/python-efl.inc | |||
| @@ -13,10 +13,6 @@ RDEPENDS_${PN} += "python-lang" | |||
| 13 | 13 | ||
| 14 | PROVIDES = "python-ecore python-eldbus python-edje python-elementary python-emotion python-evas" | 14 | PROVIDES = "python-ecore python-eldbus python-edje python-elementary python-emotion python-evas" |
| 15 | 15 | ||
| 16 | # necessary to let the call for python-config succeed | ||
| 17 | export BUILD_SYS | ||
| 18 | export HOST_SYS | ||
| 19 | |||
| 20 | inherit e-base distutils pkgconfig | 16 | inherit e-base distutils pkgconfig |
| 21 | 17 | ||
| 22 | SRCVER = "${PV}" | 18 | SRCVER = "${PV}" |
diff --git a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb b/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb index f14d4e1cf9..0d8dd5cb35 100644 --- a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb +++ b/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb | |||
| @@ -52,8 +52,6 @@ BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}" | |||
| 52 | EXTRA_OECONF_append_armv7a = "--cpu=cortex-a8" | 52 | EXTRA_OECONF_append_armv7a = "--cpu=cortex-a8" |
| 53 | 53 | ||
| 54 | # for python modules | 54 | # for python modules |
| 55 | export HOST_SYS | ||
| 56 | export BUILD_SYS | ||
| 57 | export STAGING_LIBDIR | 55 | export STAGING_LIBDIR |
| 58 | export STAGING_INCDIR | 56 | export STAGING_INCDIR |
| 59 | export PYTHON_DIR | 57 | export PYTHON_DIR |
diff --git a/meta-networking/classes/waf-samba.bbclass b/meta-networking/classes/waf-samba.bbclass index 45fbcc342b..772bc75040 100644 --- a/meta-networking/classes/waf-samba.bbclass +++ b/meta-networking/classes/waf-samba.bbclass | |||
| @@ -65,8 +65,6 @@ do_configure() { | |||
| 65 | -L ${STAGING_DIR_HOST} \ | 65 | -L ${STAGING_DIR_HOST} \ |
| 66 | -E LD_LIBRARY_PATH=${libdir_qemu}:${base_libdir_qemu}" | 66 | -E LD_LIBRARY_PATH=${libdir_qemu}:${base_libdir_qemu}" |
| 67 | 67 | ||
| 68 | export BUILD_SYS=${BUILD_SYS} | ||
| 69 | export HOST_SYS=${HOST_SYS} | ||
| 70 | export BUILD_ARCH=${BUILD_ARCH} | 68 | export BUILD_ARCH=${BUILD_ARCH} |
| 71 | export HOST_ARCH=${HOST_ARCH} | 69 | export HOST_ARCH=${HOST_ARCH} |
| 72 | export STAGING_LIBDIR=${STAGING_LIBDIR} | 70 | export STAGING_LIBDIR=${STAGING_LIBDIR} |
diff --git a/meta-oe/recipes-devtools/mercurial/mercurial-native_3.4.1.bb b/meta-oe/recipes-devtools/mercurial/mercurial-native_3.4.1.bb index 303a032fb8..aeec195fa2 100644 --- a/meta-oe/recipes-devtools/mercurial/mercurial-native_3.4.1.bb +++ b/meta-oe/recipes-devtools/mercurial/mercurial-native_3.4.1.bb | |||
| @@ -14,7 +14,7 @@ S = "${WORKDIR}/mercurial-${PV}" | |||
| 14 | inherit native | 14 | inherit native |
| 15 | 15 | ||
| 16 | EXTRA_OEMAKE = "STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \ | 16 | EXTRA_OEMAKE = "STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \ |
| 17 | BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} PREFIX=${prefix}" | 17 | PREFIX=${prefix}" |
| 18 | 18 | ||
| 19 | do_configure_append () { | 19 | do_configure_append () { |
| 20 | sed -i -e 's:PYTHON=python:PYTHON=${STAGING_BINDIR_NATIVE}/python-native/python:g' ${S}/Makefile | 20 | sed -i -e 's:PYTHON=python:PYTHON=${STAGING_BINDIR_NATIVE}/python-native/python:g' ${S}/Makefile |
diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_git.bb b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_git.bb index a2747c3508..e203198af2 100644 --- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_git.bb +++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_git.bb | |||
| @@ -24,8 +24,6 @@ EXTRA_OECMAKE = "-DLIB='${baselib}' \ | |||
| 24 | -DPYTHON_INCLUDE_PATH=${STAGING_INCDIR}/python${PYTHON_BASEVERSION}" | 24 | -DPYTHON_INCLUDE_PATH=${STAGING_INCDIR}/python${PYTHON_BASEVERSION}" |
| 25 | 25 | ||
| 26 | do_configure_prepend() { | 26 | do_configure_prepend() { |
| 27 | export HOST_SYS=${HOST_SYS} | ||
| 28 | export BUILD_SYS=${BUILD_SYS} | ||
| 29 | export STAGING_LIBDIR=${STAGING_LIBDIR} | 27 | export STAGING_LIBDIR=${STAGING_LIBDIR} |
| 30 | export STAGING_INCDIR=${STAGING_INCDIR} | 28 | export STAGING_INCDIR=${STAGING_INCDIR} |
| 31 | export ENV_INSTALL_PATH=${PYTHON_SITEPACKAGES_DIR} | 29 | export ENV_INSTALL_PATH=${PYTHON_SITEPACKAGES_DIR} |
diff --git a/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb b/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb index 86628b14bf..9848e5ac17 100644 --- a/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb +++ b/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb | |||
| @@ -15,8 +15,6 @@ DEPENDS += "cups python libusb" | |||
| 15 | 15 | ||
| 16 | inherit autotools-brokensep python-dir pythonnative pkgconfig | 16 | inherit autotools-brokensep python-dir pythonnative pkgconfig |
| 17 | 17 | ||
| 18 | export BUILD_SYS | ||
| 19 | export HOST_SYS | ||
| 20 | export STAGING_INCDIR | 18 | export STAGING_INCDIR |
| 21 | export STAGING_LIBDIR | 19 | export STAGING_LIBDIR |
| 22 | 20 | ||
diff --git a/meta-oe/recipes-extended/openwsman/openwsman_2.6.2.bb b/meta-oe/recipes-extended/openwsman/openwsman_2.6.2.bb index 52b271c114..af9633d406 100644 --- a/meta-oe/recipes-extended/openwsman/openwsman_2.6.2.bb +++ b/meta-oe/recipes-extended/openwsman/openwsman_2.6.2.bb | |||
| @@ -39,8 +39,6 @@ EXTRA_OECMAKE = "-DBUILD_BINDINGS=NO \ | |||
| 39 | " | 39 | " |
| 40 | 40 | ||
| 41 | do_configure_prepend() { | 41 | do_configure_prepend() { |
| 42 | export HOST_SYS=${HOST_SYS} | ||
| 43 | export BUILD_SYS=${BUILD_SYS} | ||
| 44 | export STAGING_INCDIR=${STAGING_INCDIR} | 42 | export STAGING_INCDIR=${STAGING_INCDIR} |
| 45 | export STAGING_LIBDIR=${STAGING_LIBDIR} | 43 | export STAGING_LIBDIR=${STAGING_LIBDIR} |
| 46 | } | 44 | } |
diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb b/meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb index 73a5d0e5b2..a43e77029a 100644 --- a/meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb +++ b/meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb | |||
| @@ -50,8 +50,6 @@ EXTRA_OECONF = " \ | |||
| 50 | --disable-rpath \ | 50 | --disable-rpath \ |
| 51 | " | 51 | " |
| 52 | 52 | ||
| 53 | export BUILD_SYS | ||
| 54 | export HOST_SYS | ||
| 55 | export STAGING_LIBDIR | 53 | export STAGING_LIBDIR |
| 56 | export STAGING_INCDIR | 54 | export STAGING_INCDIR |
| 57 | 55 | ||
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb index aef9b138ab..6b883a87e3 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb | |||
| @@ -55,9 +55,6 @@ do_compile_prepend() { | |||
| 55 | export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" | 55 | export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" |
| 56 | export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" | 56 | export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" |
| 57 | export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" | 57 | export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" |
| 58 | |||
| 59 | export BUILD_SYS="${BUILD_SYS}" | ||
| 60 | export HOST_SYS="${HOST_SYS}" | ||
| 61 | } | 58 | } |
| 62 | 59 | ||
| 63 | do_install() { | 60 | do_install() { |
| @@ -65,9 +62,6 @@ do_install() { | |||
| 65 | export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" | 62 | export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" |
| 66 | export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" | 63 | export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" |
| 67 | 64 | ||
| 68 | export BUILD_SYS="${BUILD_SYS}" | ||
| 69 | export HOST_SYS="${HOST_SYS}" | ||
| 70 | |||
| 71 | export DESTDIR="${D}" | 65 | export DESTDIR="${D}" |
| 72 | # prefix is used for RPATH and DESTDIR/prefix for instalation | 66 | # prefix is used for RPATH and DESTDIR/prefix for instalation |
| 73 | ${STAGING_BINDIR_NATIVE}/scons prefix=${prefix} install ${EXTRA_OESCONS}|| \ | 67 | ${STAGING_BINDIR_NATIVE}/scons prefix=${prefix} install ${EXTRA_OESCONS}|| \ |
diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb b/meta-oe/recipes-support/opencv/opencv_2.4.bb index eb38a5a6a4..83e7de8c0d 100644 --- a/meta-oe/recipes-support/opencv/opencv_2.4.bb +++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb | |||
| @@ -50,8 +50,6 @@ PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils," | |||
| 50 | 50 | ||
| 51 | inherit distutils-base pkgconfig cmake | 51 | inherit distutils-base pkgconfig cmake |
| 52 | 52 | ||
| 53 | export BUILD_SYS | ||
| 54 | export HOST_SYS | ||
| 55 | export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}" | 53 | export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}" |
| 56 | export PYTHON="${STAGING_BINDIR_NATIVE}/python" | 54 | export PYTHON="${STAGING_BINDIR_NATIVE}/python" |
| 57 | 55 | ||
diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb index 789512f9e0..961b9cba01 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.1.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb | |||
| @@ -70,8 +70,6 @@ PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils," | |||
| 70 | 70 | ||
| 71 | inherit distutils-base pkgconfig cmake | 71 | inherit distutils-base pkgconfig cmake |
| 72 | 72 | ||
| 73 | export BUILD_SYS | ||
| 74 | export HOST_SYS | ||
| 75 | export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}" | 73 | export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}" |
| 76 | export PYTHON="${STAGING_BINDIR_NATIVE}/python" | 74 | export PYTHON="${STAGING_BINDIR_NATIVE}/python" |
| 77 | export JAVA_HOME="${STAGING_DIR_NATIVE}/usr/bin/java" | 75 | export JAVA_HOME="${STAGING_DIR_NATIVE}/usr/bin/java" |
diff --git a/meta-oe/recipes-support/postgresql/postgresql.inc b/meta-oe/recipes-support/postgresql/postgresql.inc index 288a2d183d..32ffe190b6 100644 --- a/meta-oe/recipes-support/postgresql/postgresql.inc +++ b/meta-oe/recipes-support/postgresql/postgresql.inc | |||
| @@ -113,7 +113,7 @@ python populate_packages_prepend() { | |||
| 113 | do_configure() { | 113 | do_configure() { |
| 114 | # do_configure_prepend | 114 | # do_configure_prepend |
| 115 | # make sure configure finds python includdirs with these envs | 115 | # make sure configure finds python includdirs with these envs |
| 116 | export BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ | 116 | export \ |
| 117 | STAGING_INCDIR=${STAGING_INCDIR} \ | 117 | STAGING_INCDIR=${STAGING_INCDIR} \ |
| 118 | STAGING_LIBDIR=${STAGING_LIBDIR} | 118 | STAGING_LIBDIR=${STAGING_LIBDIR} |
| 119 | 119 | ||
diff --git a/meta-python/recipes-devtools/python/python-matplotlib_1.1.0.bb b/meta-python/recipes-devtools/python/python-matplotlib_1.1.0.bb index 69f71c7116..133e66da43 100644 --- a/meta-python/recipes-devtools/python/python-matplotlib_1.1.0.bb +++ b/meta-python/recipes-devtools/python/python-matplotlib_1.1.0.bb | |||
| @@ -19,15 +19,12 @@ EXTRA_OECONF = "--disable-docs --with-python-includes=${STAGING_INCDIR}/../" | |||
| 19 | inherit distutils | 19 | inherit distutils |
| 20 | 20 | ||
| 21 | do_compile_prepend() { | 21 | do_compile_prepend() { |
| 22 | BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ | ||
| 23 | ${STAGING_BINDIR_NATIVE}/python setup.py build ${DISTUTILS_BUILD_ARGS} || \ | 22 | ${STAGING_BINDIR_NATIVE}/python setup.py build ${DISTUTILS_BUILD_ARGS} || \ |
| 24 | true | 23 | true |
| 25 | } | 24 | } |
| 26 | 25 | ||
| 27 | # need to export these variables for python-config to work | 26 | # need to export these variables for python-config to work |
| 28 | export PYTHONPATH | 27 | export PYTHONPATH |
| 29 | export BUILD_SYS | ||
| 30 | export HOST_SYS | ||
| 31 | export STAGING_INCDIR | 28 | export STAGING_INCDIR |
| 32 | export STAGING_LIBDIR | 29 | export STAGING_LIBDIR |
| 33 | 30 | ||
diff --git a/meta-python/recipes-devtools/python/python-six.inc b/meta-python/recipes-devtools/python/python-six.inc index 408c60e88e..625cbad17f 100644 --- a/meta-python/recipes-devtools/python/python-six.inc +++ b/meta-python/recipes-devtools/python/python-six.inc | |||
| @@ -6,7 +6,6 @@ SRC_URI[md5sum] = "34eed507548117b2ab523ab14b2f8b55" | |||
| 6 | SRC_URI[sha256sum] = "105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a" | 6 | SRC_URI[sha256sum] = "105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a" |
| 7 | 7 | ||
| 8 | do_compile_append() { | 8 | do_compile_append() { |
| 9 | export BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} | ||
| 10 | ${PYTHON} setup.py -q bdist_egg --dist-dir ./ | 9 | ${PYTHON} setup.py -q bdist_egg --dist-dir ./ |
| 11 | } | 10 | } |
| 12 | do_install_append() { | 11 | do_install_append() { |
diff --git a/meta-python/recipes-devtools/python/python-vcversioner_2.14.0.0.bb b/meta-python/recipes-devtools/python/python-vcversioner_2.14.0.0.bb index e87e50f9b9..0df18f5df4 100644 --- a/meta-python/recipes-devtools/python/python-vcversioner_2.14.0.0.bb +++ b/meta-python/recipes-devtools/python/python-vcversioner_2.14.0.0.bb | |||
| @@ -10,7 +10,6 @@ SRC_URI[sha256sum] = "acd43686e92e6c8bbeb4f2eef54408567a7adea9692fa72d591eec5357 | |||
| 10 | inherit pypi setuptools | 10 | inherit pypi setuptools |
| 11 | 11 | ||
| 12 | do_compile_append() { | 12 | do_compile_append() { |
| 13 | export BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} | ||
| 14 | ${PYTHON} setup.py -q bdist_egg --dist-dir ./ | 13 | ${PYTHON} setup.py -q bdist_egg --dist-dir ./ |
| 15 | } | 14 | } |
| 16 | 15 | ||
