| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 1 | From 474e59abec88de0c455836c1f53152bf2aa26c34 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Fri, 15 Feb 2019 11:17:27 +0100 |
| 4 | Subject: [PATCH] Do not write $bindir into pkg-config files |
| 5 | |
| 6 | This would otherwise break when using the files to build other target |
| 7 | components (we need to rely on PATH containing the paths to utilities, |
| 8 | rather than use target paths). |
| 9 | |
| 10 | Upstream-Status: Inappropriate [upstream wants the paths in .pc files] |
| 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 12 | --- |
| 13 | gio/meson.build | 6 +++--- |
| 14 | glib/meson.build | 6 +++--- |
| 15 | 2 files changed, 6 insertions(+), 6 deletions(-) |
| 16 | |
| 17 | diff --git a/gio/meson.build b/gio/meson.build |
| 18 | index 85d8b14..657720a 100644 |
| 19 | --- a/gio/meson.build |
| 20 | +++ b/gio/meson.build |
| 21 | @@ -813,9 +813,9 @@ pkg.generate(libraries : libgio, |
| 22 | 'schemasdir=' + join_paths('${datadir}', schemas_subdir), |
| 23 | 'bindir=' + join_paths('${prefix}', get_option('bindir')), |
| 24 | 'giomoduledir=' + giomodulesdir, |
| 25 | - 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'), |
| 26 | - 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'), |
| 27 | - 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen')], |
| 28 | + 'glib_compile_schemas=glib-compile-schemas', |
| 29 | + 'glib_compile_resources=glib-compile-resources', |
| 30 | + 'gdbus_codegen=gdbus-codegen'], |
| 31 | version : glib_version, |
| 32 | install_dir : glib_pkgconfigreldir, |
| 33 | filebase : 'gio-2.0', |
| 34 | diff --git a/glib/meson.build b/glib/meson.build |
| 35 | index c05c694..434e8b1 100644 |
| 36 | --- a/glib/meson.build |
| 37 | +++ b/glib/meson.build |
| 38 | @@ -261,9 +261,9 @@ pkg.generate(libraries : [libglib, libintl], |
| 39 | subdirs : ['glib-2.0'], |
| 40 | extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, |
| 41 | variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), |
| 42 | - 'glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'), |
| 43 | - 'gobject_query=' + join_paths('${bindir}', 'gobject-query'), |
| 44 | - 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')], |
| 45 | + 'glib_genmarshal=glib-genmarshal', |
| 46 | + 'gobject_query=gobject-query', |
| 47 | + 'glib_mkenums=glib-mkenums'], |
| 48 | version : glib_version, |
| 49 | install_dir : glib_pkgconfigreldir, |
| 50 | filebase : 'glib-2.0', |