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 | 14 |
1 files changed, 7 insertions, 7 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..9bdd99d8a2 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 4a41bf7b050168726cc4fad4c1c72fc7c18ab779 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 |
@@ -16,16 +16,16 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
16 | 2 files changed, 11 insertions(+), 11 deletions(-) | 16 | 2 files changed, 11 insertions(+), 11 deletions(-) |
17 | 17 | ||
18 | diff --git a/gio/meson.build b/gio/meson.build | 18 | diff --git a/gio/meson.build b/gio/meson.build |
19 | index 532b086..98468a3 100644 | 19 | index 36b5bad..137e75a 100644 |
20 | --- a/gio/meson.build | 20 | --- a/gio/meson.build |
21 | +++ b/gio/meson.build | 21 | +++ b/gio/meson.build |
22 | @@ -820,14 +820,14 @@ pkg.generate(libgio, | 22 | @@ -862,14 +862,14 @@ pkg.generate(libgio, |
23 | 'schemasdir=' + join_paths('${datadir}', schemas_subdir), | 23 | 'schemasdir=' + join_paths('${datadir}', schemas_subdir), |
24 | 'bindir=' + join_paths('${prefix}', get_option('bindir')), | 24 | 'bindir=' + join_paths('${prefix}', get_option('bindir')), |
25 | 'giomoduledir=' + pkgconfig_giomodulesdir, | 25 | 'giomoduledir=' + pkgconfig_giomodulesdir, |
26 | - 'gio=' + join_paths('${bindir}', 'gio'), | 26 | - 'gio=' + join_paths('${bindir}', 'gio'), |
27 | - 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'), | 27 | - 'gio_querymodules=@0@'.format(pkgconfig_multiarch_bindir / 'gio-querymodules'), |
28 | - 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'), | 28 | - 'glib_compile_schemas=@0@'.format(pkgconfig_multiarch_bindir / 'glib-compile-schemas'), |
29 | - 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'), | 29 | - 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'), |
30 | - 'gdbus=' + join_paths('${bindir}', 'gdbus'), | 30 | - 'gdbus=' + join_paths('${bindir}', 'gdbus'), |
31 | - 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen'), | 31 | - 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen'), |
@@ -43,10 +43,10 @@ index 532b086..98468a3 100644 | |||
43 | install_dir : glib_pkgconfigreldir, | 43 | install_dir : glib_pkgconfigreldir, |
44 | filebase : 'gio-2.0', | 44 | filebase : 'gio-2.0', |
45 | diff --git a/glib/meson.build b/glib/meson.build | 45 | diff --git a/glib/meson.build b/glib/meson.build |
46 | index aaf5f00..1e0992b 100644 | 46 | index c365901..c3d6601 100644 |
47 | --- a/glib/meson.build | 47 | --- a/glib/meson.build |
48 | +++ b/glib/meson.build | 48 | +++ b/glib/meson.build |
49 | @@ -375,9 +375,9 @@ pkg.generate(libglib, | 49 | @@ -397,9 +397,9 @@ pkg.generate(libglib, |
50 | subdirs : ['glib-2.0'], | 50 | subdirs : ['glib-2.0'], |
51 | extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, | 51 | extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, |
52 | variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), | 52 | variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), |