summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch')
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch18
1 files changed, 8 insertions, 10 deletions
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch
index 47a18ec844..2a31117b13 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch
@@ -1,7 +1,7 @@
1From e08b3677dd04d6ec407ba8f74f601b2d51310eff Mon Sep 17 00:00:00 2001 1From a97d060933932e478c03f1de9513b69bc459eefc Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 8 Oct 2015 18:30:35 +0300 3Date: Thu, 8 Oct 2015 18:30:35 +0300
4Subject: [PATCH 5/5] Prefix pkg-config paths with PKG_CONFIG_SYSROOT_DIR 4Subject: [PATCH] Prefix pkg-config paths with PKG_CONFIG_SYSROOT_DIR
5 environment variable 5 environment variable
6 6
7This environment variable sets the location of sysroot directory in cross-compilation 7This environment variable sets the location of sysroot directory in cross-compilation
@@ -9,16 +9,17 @@ environments; if the variable is not set, the prefix will be empty.
9 9
10Upstream-Status: Pending [review on oe-core list] 10Upstream-Status: Pending [review on oe-core list]
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12
12--- 13---
13 Makefile-gir.am | 18 +++++++++--------- 14 Makefile-gir.am | 18 +++++++++---------
14 m4/introspection.m4 | 8 ++++---- 15 m4/introspection.m4 | 8 ++++----
15 2 files changed, 13 insertions(+), 13 deletions(-) 16 2 files changed, 13 insertions(+), 13 deletions(-)
16 17
17diff --git a/Makefile-gir.am b/Makefile-gir.am 18diff --git a/Makefile-gir.am b/Makefile-gir.am
18index a09260a..ba6e89e 100644 19index 2cd7358..eaf0afd 100644
19--- a/Makefile-gir.am 20--- a/Makefile-gir.am
20+++ b/Makefile-gir.am 21+++ b/Makefile-gir.am
21@@ -55,8 +55,8 @@ else 22@@ -58,8 +58,8 @@ else
22 endif 23 endif
23 24
24 # glib 25 # glib
@@ -29,7 +30,7 @@ index a09260a..ba6e89e 100644
29 30
30 GLIB_LIBRARY=glib-2.0 31 GLIB_LIBRARY=glib-2.0
31 32
32@@ -92,8 +92,8 @@ GLib-2.0.gir: g-ir-scanner g-ir-compiler$(EXEEXT) 33@@ -95,8 +95,8 @@ GLib-2.0.gir: g-ir-scanner g-ir-compiler$(EXEEXT)
33 gir/DBusGLib-1.0.typelib: GObject-2.0.gir 34 gir/DBusGLib-1.0.typelib: GObject-2.0.gir
34 35
35 # gobject 36 # gobject
@@ -40,7 +41,7 @@ index a09260a..ba6e89e 100644
40 41
41 GOBJECT_LIBRARY=gobject-2.0 42 GOBJECT_LIBRARY=gobject-2.0
42 43
43@@ -120,8 +120,8 @@ GObject_2_0_gir_FILES = \ 44@@ -123,8 +123,8 @@ GObject_2_0_gir_FILES = \
44 BUILT_GIRSOURCES += GObject-2.0.gir 45 BUILT_GIRSOURCES += GObject-2.0.gir
45 46
46 # gmodule 47 # gmodule
@@ -51,7 +52,7 @@ index a09260a..ba6e89e 100644
51 52
52 GMODULE_LIBRARY=gmodule-2.0 53 GMODULE_LIBRARY=gmodule-2.0
53 54
54@@ -146,13 +146,13 @@ GModule_2_0_gir_FILES = $(GLIB_INCLUDEDIR)/gmodule.h \ 55@@ -149,13 +149,13 @@ GModule_2_0_gir_FILES = $(GLIB_INCLUDEDIR)/gmodule.h \
55 BUILT_GIRSOURCES += GModule-2.0.gir 56 BUILT_GIRSOURCES += GModule-2.0.gir
56 57
57 # gio 58 # gio
@@ -91,6 +92,3 @@ index d89c3d9..b562266 100644
91 fi 92 fi
92 AC_SUBST(INTROSPECTION_SCANNER) 93 AC_SUBST(INTROSPECTION_SCANNER)
93 AC_SUBST(INTROSPECTION_COMPILER) 94 AC_SUBST(INTROSPECTION_COMPILER)
94--
952.7.0
96