diff options
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-.patch | 61 |
1 files changed, 3 insertions, 58 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 74622680d6..26f8da6d41 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 @@ | |||
1 | From 74dab0fb6104ab6b715a24b783f8e8dfa5f83617 Mon Sep 17 00:00:00 2001 | 1 | From 740d91151ffe576e0c08513af9d7bc8133eb9dfb Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Thu, 8 Oct 2015 18:30:35 +0300 | 3 | Date: Thu, 8 Oct 2015 18:30:35 +0300 |
4 | Subject: [PATCH] Prefix pkg-config paths with PKG_CONFIG_SYSROOT_DIR | 4 | Subject: [PATCH] Prefix pkg-config paths with PKG_CONFIG_SYSROOT_DIR |
@@ -11,64 +11,9 @@ Upstream-Status: Pending [review on oe-core list] | |||
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
12 | 12 | ||
13 | --- | 13 | --- |
14 | Makefile-gir.am | 18 +++++++++--------- | 14 | m4/introspection.m4 | 8 ++++---- |
15 | m4/introspection.m4 | 8 ++++---- | 15 | 1 file changed, 4 insertions(+), 4 deletions(-) |
16 | 2 files changed, 13 insertions(+), 13 deletions(-) | ||
17 | 16 | ||
18 | diff --git a/Makefile-gir.am b/Makefile-gir.am | ||
19 | index b59b0a6..24a50c2 100644 | ||
20 | --- a/Makefile-gir.am | ||
21 | +++ b/Makefile-gir.am | ||
22 | @@ -58,8 +58,8 @@ else | ||
23 | endif | ||
24 | |||
25 | # glib | ||
26 | -GLIB_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir glib-2.0)/glib-2.0 | ||
27 | -GLIB_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir glib-2.0) | ||
28 | +GLIB_INCLUDEDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir glib-2.0)/glib-2.0 | ||
29 | +GLIB_LIBDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=libdir glib-2.0) | ||
30 | |||
31 | GLIB_LIBRARY=glib-2.0 | ||
32 | |||
33 | @@ -95,8 +95,8 @@ GLib-2.0.gir: g-ir-scanner g-ir-compiler$(EXEEXT) | ||
34 | gir/DBusGLib-1.0.typelib: GObject-2.0.gir | ||
35 | |||
36 | # gobject | ||
37 | -GOBJECT_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir gobject-2.0)/glib-2.0 | ||
38 | -GOBJECT_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir gobject-2.0) | ||
39 | +GOBJECT_INCLUDEDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gobject-2.0)/glib-2.0 | ||
40 | +GOBJECT_LIBDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=libdir gobject-2.0) | ||
41 | |||
42 | GOBJECT_LIBRARY=gobject-2.0 | ||
43 | |||
44 | @@ -124,8 +124,8 @@ GObject_2_0_gir_FILES = \ | ||
45 | BUILT_GIRSOURCES += GObject-2.0.gir | ||
46 | |||
47 | # gmodule | ||
48 | -GMODULE_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir gmodule-2.0)/glib-2.0 | ||
49 | -GMODULE_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir gmodule-2.0) | ||
50 | +GMODULE_INCLUDEDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gmodule-2.0)/glib-2.0 | ||
51 | +GMODULE_LIBDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=libdir gmodule-2.0) | ||
52 | |||
53 | GMODULE_LIBRARY=gmodule-2.0 | ||
54 | |||
55 | @@ -150,13 +150,13 @@ GModule_2_0_gir_FILES = $(GLIB_INCLUDEDIR)/gmodule.h \ | ||
56 | BUILT_GIRSOURCES += GModule-2.0.gir | ||
57 | |||
58 | # gio | ||
59 | -GIO_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir gio-2.0)/glib-2.0 | ||
60 | -GIO_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir gio-2.0) | ||
61 | +GIO_INCLUDEDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gio-2.0)/glib-2.0 | ||
62 | +GIO_LIBDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=libdir gio-2.0) | ||
63 | |||
64 | GIO_LIBRARY=gio-2.0 | ||
65 | |||
66 | if HAVE_GIO_UNIX | ||
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 | ||
69 | GIO_UNIX_HDRS = $(wildcard $(GIO_UNIX_INCLUDEDIR)/gio/*.h) | ||
70 | GIO_UNIX_PACKAGES = gio-unix-2.0 | ||
71 | else | ||
72 | diff --git a/m4/introspection.m4 b/m4/introspection.m4 | 17 | diff --git a/m4/introspection.m4 b/m4/introspection.m4 |
73 | index d89c3d9..b562266 100644 | 18 | index d89c3d9..b562266 100644 |
74 | --- a/m4/introspection.m4 | 19 | --- a/m4/introspection.m4 |