diff options
Diffstat (limited to 'meta/recipes-devtools/python/python-pygobject')
2 files changed, 41 insertions, 23 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 @@ | |||
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 | @@ -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 | -- | ||
40 | 2.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 @@ | |||
1 | Upstream-Status: Accepted [https://bugzilla.gnome.org/show_bug.cgi?id=691101] | ||
2 | |||
3 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
4 | diff -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 | ||