diff options
| -rw-r--r-- | meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch | 28 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb | 3 |
2 files changed, 1 insertions, 30 deletions
diff --git a/meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch b/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 9a11442f1c..0000000000 --- a/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 @@ | |||
| 1 | From 5e5350d730f85957a42c6d846d347d080e7dd996 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 3 | Date: Fri, 23 Oct 2015 12:40:34 +0300 | ||
| 4 | Subject: [PATCH] configure.ac: add sysroot path to GI_DATADIR; don't set | ||
| 5 | introspection scanner and compiler paths | ||
| 6 | |||
| 7 | Upstream-Status: Pending [review on oe-core maillist] | ||
| 8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 9 | --- | ||
| 10 | configure.ac | 8 +------- | ||
| 11 | 1 file changed, 1 insertion(+), 7 deletions(-) | ||
| 12 | |||
| 13 | diff --git a/configure.ac b/configure.ac | ||
| 14 | index 2c0cfbd..cfcb3bf 100644 | ||
| 15 | --- a/configure.ac | ||
| 16 | +++ b/configure.ac | ||
| 17 | @@ -155,7 +155,7 @@ PKG_CHECK_MODULES(GI, | ||
| 18 | |||
| 19 | GOBJECT_INTROSPECTION_CHECK(introspection_required_version) | ||
| 20 | |||
| 21 | -GI_DATADIR=$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0) | ||
| 22 | +GI_DATADIR=$PKG_CONFIG_SYSROOT_DIR$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0) | ||
| 23 | AC_SUBST(GI_DATADIR) | ||
| 24 | |||
| 25 | if test "$enable_cairo" != no; then | ||
| 26 | -- | ||
| 27 | 2.1.4 | ||
| 28 | |||
diff --git a/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb b/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb index 4edf008083..fb4a0b1811 100644 --- a/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb +++ b/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb | |||
| @@ -6,12 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" | |||
| 6 | 6 | ||
| 7 | inherit autotools pkgconfig gnomebase gobject-introspection distutils-base | 7 | inherit autotools pkgconfig gnomebase gobject-introspection distutils-base |
| 8 | 8 | ||
| 9 | DEPENDS += "gnome-common-native python glib-2.0" | 9 | DEPENDS += "python glib-2.0" |
| 10 | 10 | ||
| 11 | SRCNAME="pygobject" | 11 | SRCNAME="pygobject" |
| 12 | SRC_URI = " \ | 12 | SRC_URI = " \ |
| 13 | http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz \ | 13 | http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz \ |
| 14 | file://0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch \ | ||
| 15 | " | 14 | " |
| 16 | 15 | ||
| 17 | SRC_URI[md5sum] = "3bac63c86bb963aa401f97859464aa90" | 16 | SRC_URI[md5sum] = "3bac63c86bb963aa401f97859464aa90" |
