summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiko Mauno <niko.mauno@iki.fi>2018-12-01 19:57:10 +0200
committerKhem Raj <raj.khem@gmail.com>2018-12-02 11:05:02 -0800
commit7b47fbc02ec8e8fe85d51695e13ee0aa271b753f (patch)
treee8197dfa89336c6157be745b0900dd8f81687dd4
parent1204dd2d0b2c785a7cac0ec810c51a4a79fd4181 (diff)
downloadmeta-openembedded-7b47fbc02ec8e8fe85d51695e13ee0aa271b753f.tar.gz
python-pygobject: Drop redundant dependencies
Simplify recipe by reflecting following changes introduced to Pythonv3 variant of this recipe in commits http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/meta?id=b663374cf41465c6dc94001d6fa73a5523542fb6 http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/meta?id=521ea98b2c622f5ae7e6d18849a0379fa7ed4e90 in which the gnome-common dependency was left out due to pygobject moving to autoconf-archive, and remaining configure.ac patch file was also deemed unnecessary. Signed-off-by: Niko Mauno <niko.mauno@iki.fi> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch28
-rw-r--r--meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb3
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 9a11442f1..000000000
--- 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 @@
1From 5e5350d730f85957a42c6d846d347d080e7dd996 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 23 Oct 2015 12:40:34 +0300
4Subject: [PATCH] configure.ac: add sysroot path to GI_DATADIR; don't set
5 introspection scanner and compiler paths
6
7Upstream-Status: Pending [review on oe-core maillist]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9---
10 configure.ac | 8 +-------
11 1 file changed, 1 insertion(+), 7 deletions(-)
12
13diff --git a/configure.ac b/configure.ac
14index 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--
272.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 4edf00808..fb4a0b181 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
7inherit autotools pkgconfig gnomebase gobject-introspection distutils-base 7inherit autotools pkgconfig gnomebase gobject-introspection distutils-base
8 8
9DEPENDS += "gnome-common-native python glib-2.0" 9DEPENDS += "python glib-2.0"
10 10
11SRCNAME="pygobject" 11SRCNAME="pygobject"
12SRC_URI = " \ 12SRC_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
17SRC_URI[md5sum] = "3bac63c86bb963aa401f97859464aa90" 16SRC_URI[md5sum] = "3bac63c86bb963aa401f97859464aa90"