summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch41
-rw-r--r--meta/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch23
-rw-r--r--meta/recipes-devtools/python/python-pygobject_2.28.3.bb53
-rw-r--r--meta/recipes-devtools/python/python-pygobject_3.18.2.bb25
4 files changed, 66 insertions, 76 deletions
diff --git a/meta/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch b/meta/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch
new file mode 100644
index 0000000000..a391f7e74e
--- /dev/null
+++ b/meta/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch
@@ -0,0 +1,41 @@
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@@ -194,7 +194,7 @@ PKG_CHECK_MODULES(GI,
18 gobject-introspection-1.0 >= introspection_required_version
19 )
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@@ -219,12 +219,6 @@ AC_ARG_WITH(common,
27 with_common=yes)
28 AM_CONDITIONAL(WITH_COMMON, test "$with_common" = "yes")
29
30-INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
31-INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
32-
33-AC_SUBST(INTROSPECTION_SCANNER)
34-AC_SUBST(INTROSPECTION_COMPILER)
35-
36 # compiler warnings, errors, required cflags, and code coverage support
37 GNOME_COMPILE_WARNINGS([maximum])
38 AC_MSG_CHECKING(for Gnome code coverage support)
39--
402.1.4
41
diff --git a/meta/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch b/meta/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch
deleted file mode 100644
index c2591123b3..0000000000
--- a/meta/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1Upstream-Status: Accepted [https://bugzilla.gnome.org/show_bug.cgi?id=691101]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd pygobject-2.27.91/configure.ac pygobject-2.27.91/configure.ac
5--- pygobject-2.27.91/configure.ac 2011-02-23 22:14:37.000000000 +0200
6+++ pygobject-2.27.91/configure.ac 2013-01-03 05:13:44.034949954 +0200
7@@ -35,7 +35,7 @@
8 AC_DEFINE(PYGOBJECT_MICRO_VERSION, pygobject_micro_version, [pygobject micro version])
9 AC_SUBST(PYGOBJECT_MICRO_VERSION, pygobject_micro_version)
10
11-AM_CONFIG_HEADER(config.h)
12+AC_CONFIG_HEADERS(config.h)
13 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)])
14 AM_INIT_AUTOMAKE(foreign)
15 AM_MAINTAINER_MODE
16@@ -82,7 +82,6 @@
17 m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
18 AC_ISC_POSIX
19 AC_PROG_CC
20-AM_PROG_CC_STDC
21 AM_PROG_CC_C_O
22
23 # check that we have the minimum version of python necisary to build
diff --git a/meta/recipes-devtools/python/python-pygobject_2.28.3.bb b/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
deleted file mode 100644
index 81d37b49cf..0000000000
--- a/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
+++ /dev/null
@@ -1,53 +0,0 @@
1SUMMARY = "Python GObject bindings"
2SECTION = "devel/python"
3LICENSE = "LGPLv2.1"
4
5RECIPE_NO_UPDATE_REASON = "Newer versions of python-pygobject depend on gobject-introspection which doesn't cross-compile"
6
7LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
8DEPENDS = "python python-pygobject-native libffi glib-2.0"
9DEPENDS_class-native = "python-native libffi-native glib-2.0-native"
10RDEPENDS_class-native = ""
11
12MAJ_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
13
14SRC_URI = "${GNOME_MIRROR}/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2 \
15 file://obsolete_automake_macros.patch \
16"
17
18# libtool-native doesn't have fixinstall.patch applied which means
19# that libs get relinked at installation time. This triggers a
20# relinking along the lines of:
21# gcc -L/tmp/foo/media/build1/poky/build/tmp/sysroots/x86_64-linux/usr/lib -lpyglib-2.0-python -o .libs/_glib.so
22# where /tmp/foo is DESTDIR and pyglib-2.0-python may be installed/reinstalled
23# at the same time as the gcc command runs.
24# If this happens between the handoff between gcc and ld, you can see:
25# /bin/ld: cannot find -lpyglib-2.0-python
26# Adding a dependency rule like install-pyglibLTLIBRARIES: install-libLTLIBRARIES
27# would be ideal but automake can't cope with that without manually
28# defining the whole function. Give up and disable parallel make in native builds.
29PARALLEL_MAKEINST_class-native = ""
30
31SRC_URI[md5sum] = "aa64900b274c4661a5c32e52922977f9"
32SRC_URI[sha256sum] = "7da88c169a56efccc516cebd9237da3fe518a343095a664607b368fe21df95b6"
33S = "${WORKDIR}/pygobject-${PV}"
34
35EXTRA_OECONF += "--disable-introspection"
36
37inherit autotools distutils-base pkgconfig
38
39# necessary to let the call for python-config succeed
40export BUILD_SYS
41export HOST_SYS
42export STAGING_INCDIR
43export STAGING_LIBDIR
44
45PACKAGES += "${PN}-lib"
46
47RDEPENDS_${PN} += "python-textutils"
48
49FILES_${PN} = "${libdir}/python*"
50FILES_${PN}-lib = "${libdir}/lib*.so.*"
51FILES_${PN}-dev += "${bindir} ${datadir}"
52
53BBCLASSEXTEND = "native"
diff --git a/meta/recipes-devtools/python/python-pygobject_3.18.2.bb b/meta/recipes-devtools/python/python-pygobject_3.18.2.bb
new file mode 100644
index 0000000000..e61d75ca3e
--- /dev/null
+++ b/meta/recipes-devtools/python/python-pygobject_3.18.2.bb
@@ -0,0 +1,25 @@
1SUMMARY = "Python GObject bindings"
2SECTION = "devel/python"
3LICENSE = "LGPLv2.1"
4LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
5
6inherit autotools pkgconfig gnomebase distutils3-base gobject-introspection
7
8DEPENDS += "python3 glib-2.0 gnome-common"
9
10SRCNAME="pygobject"
11SRC_URI = " \
12 http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz \
13 file://0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch \
14"
15
16SRC_URI[md5sum] = "0a956f3e785e23b0f136832f2e57a862"
17SRC_URI[sha256sum] = "2a3cad1517916b74e131e6002c3824361aee0671ffb0d55ded119477fc1c2c5f"
18
19S = "${WORKDIR}/${SRCNAME}-${PV}"
20
21BBCLASSEXTEND = "native"
22
23EXTRA_OECONF = "--disable-cairo"
24
25RDEPENDS_${PN} += "python3-setuptools"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 12:29:36 +0000