| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 1 | From abc26aed7a28678dfcc20b21726a97c7c02ea73b Mon Sep 17 00:00:00 2001 |
| 2 | From: Anuj Mittal <anuj.mittal@intel.com> |
| 3 | Date: Thu, 14 Feb 2019 14:55:15 +0800 |
| 4 | Subject: [PATCH] Revert "Use absolute paths in pkg-config files" |
| 5 | |
| 6 | This reverts commit e7a7c9b97776fa2a638d18ea3a931ba84e778f80. |
| 7 | |
| 8 | The glib pkgconfig files now contain absolute paths, but they're |
| 9 | target paths so when we used them from a sysroot it fails. Upstream |
| 10 | thinks that we should be setting |
| 11 | GLIB_MKENUMS=/path/to/sysroot/usr/bin/glib-mkenums but that really |
| 12 | doesn't scale. |
| 13 | |
| 14 | For now, we just revert the change to put absolute paths into |
| 15 | the sysroot. This should be re-evaluated when we move the recipe to use |
| 16 | meson. |
| 17 | |
| 18 | Upstream-Status: Inappropriate [Revert of an upstream commit] |
| 19 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> |
| 20 | --- |
| 21 | gio-2.0.pc.in | 7 +++---- |
| 22 | glib-2.0.pc.in | 7 +++---- |
| 23 | 2 files changed, 6 insertions(+), 8 deletions(-) |
| 24 | |
| 25 | diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in |
| 26 | index d67e80839..526f0daa0 100644 |
| 27 | --- a/gio-2.0.pc.in |
| 28 | +++ b/gio-2.0.pc.in |
| 29 | @@ -5,11 +5,10 @@ includedir=@includedir@ |
| 30 | |
| 31 | datadir=@datadir@ |
| 32 | schemasdir=${datadir}/glib-2.0/schemas |
| 33 | -bindir=@bindir@ |
| 34 | giomoduledir=@GIO_MODULE_DIR@ |
| 35 | -glib_compile_schemas=${bindir}/glib-compile-schemas |
| 36 | -glib_compile_resources=${bindir}/glib-compile-resources |
| 37 | -gdbus_codegen=${bindir}/gdbus-codegen |
| 38 | +glib_compile_schemas=glib-compile-schemas |
| 39 | +glib_compile_resources=glib-compile-resources |
| 40 | +gdbus_codegen=gdbus-codegen |
| 41 | |
| 42 | Name: GIO |
| 43 | Description: glib I/O library |
| 44 | diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in |
| 45 | index 3c5ea81dc..275fc0163 100644 |
| 46 | --- a/glib-2.0.pc.in |
| 47 | +++ b/glib-2.0.pc.in |
| 48 | @@ -3,10 +3,9 @@ exec_prefix=@exec_prefix@ |
| 49 | libdir=@libdir@ |
| 50 | includedir=@includedir@ |
| 51 | |
| 52 | -bindir=@bindir@ |
| 53 | -glib_genmarshal=${bindir}/glib-genmarshal |
| 54 | -gobject_query=${bindir}/gobject-query |
| 55 | -glib_mkenums=${bindir}/glib-mkenums |
| 56 | +glib_genmarshal=glib-genmarshal |
| 57 | +gobject_query=gobject-query |
| 58 | +glib_mkenums=glib-mkenums |
| 59 | |
| 60 | Name: GLib |
| 61 | Description: C Utility Library |
| 62 | -- |
| 63 | 2.17.1 |
| 64 | |