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-.patch10
1 files changed, 5 insertions, 5 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 2a31117b13..74622680d6 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,4 +1,4 @@
1From a97d060933932e478c03f1de9513b69bc459eefc Mon Sep 17 00:00:00 2001 1From 74dab0fb6104ab6b715a24b783f8e8dfa5f83617 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] Prefix pkg-config paths with PKG_CONFIG_SYSROOT_DIR 4Subject: [PATCH] Prefix pkg-config paths with PKG_CONFIG_SYSROOT_DIR
@@ -16,7 +16,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
16 2 files changed, 13 insertions(+), 13 deletions(-) 16 2 files changed, 13 insertions(+), 13 deletions(-)
17 17
18diff --git a/Makefile-gir.am b/Makefile-gir.am 18diff --git a/Makefile-gir.am b/Makefile-gir.am
19index 2cd7358..eaf0afd 100644 19index b59b0a6..24a50c2 100644
20--- a/Makefile-gir.am 20--- a/Makefile-gir.am
21+++ b/Makefile-gir.am 21+++ b/Makefile-gir.am
22@@ -58,8 +58,8 @@ else 22@@ -58,8 +58,8 @@ else
@@ -41,7 +41,7 @@ index 2cd7358..eaf0afd 100644
41 41
42 GOBJECT_LIBRARY=gobject-2.0 42 GOBJECT_LIBRARY=gobject-2.0
43 43
44@@ -123,8 +123,8 @@ GObject_2_0_gir_FILES = \ 44@@ -124,8 +124,8 @@ GObject_2_0_gir_FILES = \
45 BUILT_GIRSOURCES += GObject-2.0.gir 45 BUILT_GIRSOURCES += GObject-2.0.gir
46 46
47 # gmodule 47 # gmodule
@@ -52,7 +52,7 @@ index 2cd7358..eaf0afd 100644
52 52
53 GMODULE_LIBRARY=gmodule-2.0 53 GMODULE_LIBRARY=gmodule-2.0
54 54
55@@ -149,13 +149,13 @@ GModule_2_0_gir_FILES = $(GLIB_INCLUDEDIR)/gmodule.h \ 55@@ -150,13 +150,13 @@ GModule_2_0_gir_FILES = $(GLIB_INCLUDEDIR)/gmodule.h \
56 BUILT_GIRSOURCES += GModule-2.0.gir 56 BUILT_GIRSOURCES += GModule-2.0.gir
57 57
58 # gio 58 # gio
@@ -66,7 +66,7 @@ index 2cd7358..eaf0afd 100644
66 if HAVE_GIO_UNIX 66 if HAVE_GIO_UNIX
67-GIO_UNIX_INCLUDEDIR = $(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0 67-GIO_UNIX_INCLUDEDIR = $(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0
68+GIO_UNIX_INCLUDEDIR = $(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0 68+GIO_UNIX_INCLUDEDIR = $(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0
69 GIO_UNIX_HDRS = $(GIO_UNIX_INCLUDEDIR)/gio/*.h 69 GIO_UNIX_HDRS = $(wildcard $(GIO_UNIX_INCLUDEDIR)/gio/*.h)
70 GIO_UNIX_PACKAGES = gio-unix-2.0 70 GIO_UNIX_PACKAGES = gio-unix-2.0
71 else 71 else
72diff --git a/m4/introspection.m4 b/m4/introspection.m4 72diff --git a/m4/introspection.m4 b/m4/introspection.m4