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 | 31 |
1 files changed, 21 insertions, 10 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 ede29c90ba..edac4c9f75 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 474e59abec88de0c455836c1f53152bf2aa26c34 Mon Sep 17 00:00:00 2001 | 1 | From 60b36289ac314ad972cf81c1acd19f6f2e58ff25 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,33 +9,44 @@ 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 | |||
12 | --- | 13 | --- |
13 | gio/meson.build | 6 +++--- | 14 | gio/meson.build | 16 ++++++++-------- |
14 | glib/meson.build | 6 +++--- | 15 | glib/meson.build | 6 +++--- |
15 | 2 files changed, 6 insertions(+), 6 deletions(-) | 16 | 2 files changed, 11 insertions(+), 11 deletions(-) |
16 | 17 | ||
17 | diff --git a/gio/meson.build b/gio/meson.build | 18 | diff --git a/gio/meson.build b/gio/meson.build |
18 | index 85d8b14..657720a 100644 | 19 | index 71e88c4..8ce3987 100644 |
19 | --- a/gio/meson.build | 20 | --- a/gio/meson.build |
20 | +++ b/gio/meson.build | 21 | +++ b/gio/meson.build |
21 | @@ -813,9 +813,9 @@ pkg.generate(libraries : libgio, | 22 | @@ -831,14 +831,14 @@ pkg.generate(libgio, |
22 | 'schemasdir=' + join_paths('${datadir}', schemas_subdir), | 23 | 'schemasdir=' + join_paths('${datadir}', schemas_subdir), |
23 | 'bindir=' + join_paths('${prefix}', get_option('bindir')), | 24 | 'bindir=' + join_paths('${prefix}', get_option('bindir')), |
24 | 'giomoduledir=' + giomodulesdir, | 25 | 'giomoduledir=' + giomodulesdir, |
26 | - 'gio=' + join_paths('${bindir}', 'gio'), | ||
27 | - 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'), | ||
25 | - 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'), | 28 | - 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'), |
26 | - 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'), | 29 | - 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'), |
27 | - 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen')], | 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', | ||
28 | + 'glib_compile_schemas=glib-compile-schemas', | 36 | + 'glib_compile_schemas=glib-compile-schemas', |
29 | + 'glib_compile_resources=glib-compile-resources', | 37 | + 'glib_compile_resources=glib-compile-resources', |
30 | + 'gdbus_codegen=gdbus-codegen'], | 38 | + 'gdbus=gdbus', |
39 | + 'gdbus_codegen=gdbus-codegen', | ||
40 | + 'gresource=gresource', | ||
41 | + 'gsettings=gsettings'], | ||
31 | version : glib_version, | 42 | version : glib_version, |
32 | install_dir : glib_pkgconfigreldir, | 43 | install_dir : glib_pkgconfigreldir, |
33 | filebase : 'gio-2.0', | 44 | filebase : 'gio-2.0', |
34 | diff --git a/glib/meson.build b/glib/meson.build | 45 | diff --git a/glib/meson.build b/glib/meson.build |
35 | index c05c694..434e8b1 100644 | 46 | index 91a48f1..978fb73 100644 |
36 | --- a/glib/meson.build | 47 | --- a/glib/meson.build |
37 | +++ b/glib/meson.build | 48 | +++ b/glib/meson.build |
38 | @@ -261,9 +261,9 @@ pkg.generate(libraries : [libglib, libintl], | 49 | @@ -375,9 +375,9 @@ pkg.generate(libglib, |
39 | subdirs : ['glib-2.0'], | 50 | subdirs : ['glib-2.0'], |
40 | extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, | 51 | extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, |
41 | variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), | 52 | variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), |