diff options
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch | 75 |
1 files changed, 37 insertions, 38 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch index 5fe3aa898e..8e6598fbef 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 0797a40627a4cb5439a24b872edc65356dceaaf0 Mon Sep 17 00:00:00 2001 | 1 | From e7077aa23bfcd31a8e72e39dc93ce4f854678376 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: Fri, 15 Feb 2019 11:17:27 +0100 | 3 | Date: Fri, 15 Feb 2019 11:17:27 +0100 |
4 | Subject: [PATCH] Do not write $bindir into pkg-config files | 4 | Subject: [PATCH] Do not write $bindir into pkg-config files |
@@ -9,53 +9,52 @@ rather than use target paths). | |||
9 | 9 | ||
10 | Upstream-Status: Inappropriate [upstream wants the paths in .pc files] | 10 | Upstream-Status: Inappropriate [upstream wants the paths in .pc files] |
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
12 | |||
13 | --- | 12 | --- |
14 | gio/meson.build | 16 ++++++++-------- | 13 | gio/meson.build | 16 ++++++++-------- |
15 | glib/meson.build | 6 +++--- | 14 | glib/meson.build | 6 +++--- |
16 | 2 files changed, 11 insertions(+), 11 deletions(-) | 15 | 2 files changed, 11 insertions(+), 11 deletions(-) |
17 | 16 | ||
18 | diff --git a/gio/meson.build b/gio/meson.build | 17 | diff --git a/gio/meson.build b/gio/meson.build |
19 | index 532b086..98468a3 100644 | 18 | index 5f91586..1a95f4f 100644 |
20 | --- a/gio/meson.build | 19 | --- a/gio/meson.build |
21 | +++ b/gio/meson.build | 20 | +++ b/gio/meson.build |
22 | @@ -820,14 +820,14 @@ pkg.generate(libgio, | 21 | @@ -884,14 +884,14 @@ pkg.generate(libgio, |
23 | 'schemasdir=' + join_paths('${datadir}', schemas_subdir), | 22 | 'dtdsdir=' + '${datadir}' / dtds_subdir, |
24 | 'bindir=' + join_paths('${prefix}', get_option('bindir')), | 23 | 'bindir=' + '${prefix}' / get_option('bindir'), |
25 | 'giomoduledir=' + pkgconfig_giomodulesdir, | 24 | 'giomoduledir=' + pkgconfig_giomodulesdir, |
26 | - 'gio=' + join_paths('${bindir}', 'gio'), | 25 | - 'gio=' + '${bindir}' / 'gio', |
27 | - 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'), | 26 | - 'gio_querymodules=' + pkgconfig_multiarch_bindir / 'gio-querymodules', |
28 | - 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'), | 27 | - 'glib_compile_schemas=' + pkgconfig_multiarch_bindir / 'glib-compile-schemas', |
29 | - 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'), | 28 | - 'glib_compile_resources=' + '${bindir}' / 'glib-compile-resources', |
30 | - 'gdbus=' + join_paths('${bindir}', 'gdbus'), | 29 | - 'gdbus=' + '${bindir}' /'gdbus', |
31 | - 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen'), | 30 | - 'gdbus_codegen=' + '${bindir}' / 'gdbus-codegen', |
32 | - 'gresource=' + join_paths('${bindir}', 'gresource'), | 31 | - 'gresource=' + '${bindir}' / 'gresource', |
33 | - 'gsettings=' + join_paths('${bindir}', 'gsettings')], | 32 | - 'gsettings=' + '${bindir}' / 'gsettings', |
34 | + 'gio=gio', | 33 | + 'gio=gio', |
35 | + 'gio_querymodules=gio-querymodules', | 34 | + 'gio_querymodules=gio-querymodules', |
36 | + 'glib_compile_schemas=glib-compile-schemas', | 35 | + 'glib_compile_schemas=glib-compile-schemas', |
37 | + 'glib_compile_resources=glib-compile-resources', | 36 | + 'glib_compile_resources=glib-compile-resources', |
38 | + 'gdbus=gdbus', | 37 | + 'gdbus=gdbus', |
39 | + 'gdbus_codegen=gdbus-codegen', | 38 | + 'gdbus_codegen=gdbus-codegen', |
40 | + 'gresource=gresource', | 39 | + 'gresource=gresource', |
41 | + 'gsettings=gsettings'], | 40 | + 'gsettings=gsettings', |
41 | ], | ||
42 | version : glib_version, | 42 | version : glib_version, |
43 | install_dir : glib_pkgconfigreldir, | 43 | install_dir : glib_pkgconfigreldir, |
44 | filebase : 'gio-2.0', | ||
45 | diff --git a/glib/meson.build b/glib/meson.build | 44 | diff --git a/glib/meson.build b/glib/meson.build |
46 | index aaf5f00..1e0992b 100644 | 45 | index c26a35e..1d8ca6b 100644 |
47 | --- a/glib/meson.build | 46 | --- a/glib/meson.build |
48 | +++ b/glib/meson.build | 47 | +++ b/glib/meson.build |
49 | @@ -375,9 +375,9 @@ pkg.generate(libglib, | 48 | @@ -447,9 +447,9 @@ pkg.generate(libglib, |
50 | subdirs : ['glib-2.0'], | 49 | variables : [ |
51 | extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, | 50 | 'bindir=' + '${prefix}' / get_option('bindir'), |
52 | variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), | 51 | 'datadir=' + '${prefix}' / get_option('datadir'), |
53 | - 'glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'), | 52 | - 'glib_genmarshal=' + '${bindir}' / 'glib-genmarshal', |
54 | - 'gobject_query=' + join_paths('${bindir}', 'gobject-query'), | 53 | - 'gobject_query=' + '${bindir}' / 'gobject-query', |
55 | - 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')], | 54 | - 'glib_mkenums=' + '${bindir}' / 'glib-mkenums', |
56 | + 'glib_genmarshal=glib-genmarshal', | 55 | + 'glib_genmarshal=glib-genmarshal', |
57 | + 'gobject_query=gobject-query', | 56 | + 'gobject_query=gobject-query', |
58 | + 'glib_mkenums=glib-mkenums'], | 57 | + 'glib_mkenums=glib-mkenums', |
59 | version : glib_version, | 58 | 'glib_valgrind_suppressions=' + '${datadir}' / |
60 | install_dir : glib_pkgconfigreldir, | 59 | valgrind_suppression_file_install_subdir / |
61 | filebase : 'glib-2.0', | 60 | fs.name(valgrind_suppression_file), |