Andrew Geissler | 4b740dc | 2020-05-05 08:54:39 -0500 | [diff] [blame] | 1 | From 0797a40627a4cb5439a24b872edc65356dceaaf0 Mon Sep 17 00:00:00 2001 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 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> |
Brad Bishop | f3f93bb | 2019-10-16 14:33:32 -0400 | [diff] [blame] | 12 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 13 | --- |
Brad Bishop | f3f93bb | 2019-10-16 14:33:32 -0400 | [diff] [blame] | 14 | gio/meson.build | 16 ++++++++-------- |
| 15 | glib/meson.build | 6 +++--- |
| 16 | 2 files changed, 11 insertions(+), 11 deletions(-) |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 17 | |
| 18 | diff --git a/gio/meson.build b/gio/meson.build |
Andrew Geissler | 4b740dc | 2020-05-05 08:54:39 -0500 | [diff] [blame] | 19 | index 532b086..98468a3 100644 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 20 | --- a/gio/meson.build |
| 21 | +++ b/gio/meson.build |
Andrew Geissler | 4b740dc | 2020-05-05 08:54:39 -0500 | [diff] [blame] | 22 | @@ -820,14 +820,14 @@ pkg.generate(libgio, |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 23 | 'schemasdir=' + join_paths('${datadir}', schemas_subdir), |
| 24 | 'bindir=' + join_paths('${prefix}', get_option('bindir')), |
Andrew Geissler | 4b740dc | 2020-05-05 08:54:39 -0500 | [diff] [blame] | 25 | 'giomoduledir=' + pkgconfig_giomodulesdir, |
Brad Bishop | f3f93bb | 2019-10-16 14:33:32 -0400 | [diff] [blame] | 26 | - 'gio=' + join_paths('${bindir}', 'gio'), |
| 27 | - 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'), |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 28 | - 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'), |
| 29 | - 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'), |
Brad Bishop | f3f93bb | 2019-10-16 14:33:32 -0400 | [diff] [blame] | 30 | - 'gdbus=' + join_paths('${bindir}', 'gdbus'), |
| 31 | - 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen'), |
| 32 | - 'gresource=' + join_paths('${bindir}', 'gresource'), |
| 33 | - 'gsettings=' + join_paths('${bindir}', 'gsettings')], |
| 34 | + 'gio=gio', |
| 35 | + 'gio_querymodules=gio-querymodules', |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 36 | + 'glib_compile_schemas=glib-compile-schemas', |
| 37 | + 'glib_compile_resources=glib-compile-resources', |
Brad Bishop | f3f93bb | 2019-10-16 14:33:32 -0400 | [diff] [blame] | 38 | + 'gdbus=gdbus', |
| 39 | + 'gdbus_codegen=gdbus-codegen', |
| 40 | + 'gresource=gresource', |
| 41 | + 'gsettings=gsettings'], |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 42 | version : glib_version, |
| 43 | install_dir : glib_pkgconfigreldir, |
| 44 | filebase : 'gio-2.0', |
| 45 | diff --git a/glib/meson.build b/glib/meson.build |
Andrew Geissler | 4b740dc | 2020-05-05 08:54:39 -0500 | [diff] [blame] | 46 | index aaf5f00..1e0992b 100644 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 47 | --- a/glib/meson.build |
| 48 | +++ b/glib/meson.build |
Brad Bishop | f3f93bb | 2019-10-16 14:33:32 -0400 | [diff] [blame] | 49 | @@ -375,9 +375,9 @@ pkg.generate(libglib, |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 50 | subdirs : ['glib-2.0'], |
| 51 | extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, |
| 52 | variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), |
| 53 | - 'glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'), |
| 54 | - 'gobject_query=' + join_paths('${bindir}', 'gobject-query'), |
| 55 | - 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')], |
| 56 | + 'glib_genmarshal=glib-genmarshal', |
| 57 | + 'gobject_query=gobject-query', |
| 58 | + 'glib_mkenums=glib-mkenums'], |
| 59 | version : glib_version, |
| 60 | install_dir : glib_pkgconfigreldir, |
| 61 | filebase : 'glib-2.0', |