diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-devtools')
3 files changed, 9 insertions, 39 deletions
diff --git a/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb b/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb index 3052eb048..f3a0f70ee 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb @@ -90,5 +90,7 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \ " FILES_luajit-common = "${datadir}/${BPN}-${PV}" -# Aarch64 is not supported in this release -COMPATIBLE_HOST = "^(?!aarch64).*" +# Aarch64/mips64 is not supported in this release +COMPATIBLE_HOST_aarch64 = "null" +COMPATIBLE_HOST_mipsarchn32 = "null" +COMPATIBLE_HOST_mipsarchn64 = "null" diff --git a/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch b/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch deleted file mode 100644 index 9a11442f1..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 5e5350d730f85957a42c6d846d347d080e7dd996 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Fri, 23 Oct 2015 12:40:34 +0300 -Subject: [PATCH] configure.ac: add sysroot path to GI_DATADIR; don't set - introspection scanner and compiler paths - -Upstream-Status: Pending [review on oe-core maillist] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - configure.ac | 8 +------- - 1 file changed, 1 insertion(+), 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 2c0cfbd..cfcb3bf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -155,7 +155,7 @@ PKG_CHECK_MODULES(GI, - - GOBJECT_INTROSPECTION_CHECK(introspection_required_version) - --GI_DATADIR=$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0) -+GI_DATADIR=$PKG_CONFIG_SYSROOT_DIR$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0) - AC_SUBST(GI_DATADIR) - - if test "$enable_cairo" != no; then --- -2.1.4 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb b/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb index c444fbf05..348a0398f 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb @@ -4,17 +4,13 @@ SECTION = "devel/python" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" -inherit autotools pkgconfig gnomebase distutils-base gobject-introspection +inherit gnomebase gobject-introspection distutils-base upstream-version-is-even -PYTHON_BASEVERSION = "2.7" -PYTHON_PN = "python" +DEPENDS += "python glib-2.0" -DEPENDS += "gnome-common-native python glib-2.0" - -SRCNAME="pygobject" +SRCNAME = "pygobject" SRC_URI = " \ http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz \ - file://0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch \ " SRC_URI[md5sum] = "3bac63c86bb963aa401f97859464aa90" @@ -24,12 +20,12 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" BBCLASSEXTEND = "native" -EXTRA_OECONF = "--disable-cairo --with-python=${PYTHON}" +EXTRA_OECONF = "--disable-cairo" RDEPENDS_${PN} += "python-setuptools" RDEPENDS_${PN}_class-native = "" do_install_append() { # Remove files that clash with python3-pygobject; their content is same - rm -rf ${D}${includedir}/pygobject-3.0//pygobject.h ${D}${libdir}/pkgconfig + rm -r ${D}${includedir}/pygobject-3.0/pygobject.h ${D}${libdir}/pkgconfig } |