diff options
Diffstat (limited to 'meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch')
-rw-r--r-- | meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch | 19 |
1 files changed, 3 insertions, 16 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 index a391f7e74..9a11442f1 100644 --- 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 | |||
@@ -14,28 +14,15 @@ diff --git a/configure.ac b/configure.ac | |||
14 | index 2c0cfbd..cfcb3bf 100644 | 14 | index 2c0cfbd..cfcb3bf 100644 |
15 | --- a/configure.ac | 15 | --- a/configure.ac |
16 | +++ b/configure.ac | 16 | +++ b/configure.ac |
17 | @@ -194,7 +194,7 @@ PKG_CHECK_MODULES(GI, | 17 | @@ -155,7 +155,7 @@ PKG_CHECK_MODULES(GI, |
18 | gobject-introspection-1.0 >= introspection_required_version | 18 | |
19 | ) | 19 | GOBJECT_INTROSPECTION_CHECK(introspection_required_version) |
20 | 20 | ||
21 | -GI_DATADIR=$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0) | 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) | 22 | +GI_DATADIR=$PKG_CONFIG_SYSROOT_DIR$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0) |
23 | AC_SUBST(GI_DATADIR) | 23 | AC_SUBST(GI_DATADIR) |
24 | 24 | ||
25 | if test "$enable_cairo" != no; then | 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 | -- | 26 | -- |
40 | 2.1.4 | 27 | 2.1.4 |
41 | 28 | ||