diff options
-rw-r--r-- | meta/recipes-devtools/vala/vala/0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch | 38 | ||||
-rw-r--r-- | meta/recipes-devtools/vala/vala_0.54.4.bb | 5 | ||||
-rw-r--r-- | meta/recipes-devtools/vala/vala_0.54.6.bb | 3 |
3 files changed, 3 insertions, 43 deletions
diff --git a/meta/recipes-devtools/vala/vala/0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch b/meta/recipes-devtools/vala/vala/0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch deleted file mode 100644 index 2aaf2ab94e..0000000000 --- a/meta/recipes-devtools/vala/vala/0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | From dbb1c58e86f2af4613f3ac9571d9b163d4bca675 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Fri, 23 Oct 2015 16:13:54 +0300 | ||
4 | Subject: [PATCH] vapigen.m4: use $PKG_CONFIG_SYSROOT_DIR | ||
5 | |||
6 | This is necessary in cross-compiling environments, where directories | ||
7 | returned by pkg-config should be prefixed with sysroot location. | ||
8 | |||
9 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/vala/-/merge_requests/218] | ||
10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
11 | --- | ||
12 | vapigen/vapigen.m4 | 8 ++++---- | ||
13 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
14 | |||
15 | diff --git a/vapigen/vapigen.m4 b/vapigen/vapigen.m4 | ||
16 | index 2c435e7..6228991 100644 | ||
17 | --- a/vapigen/vapigen.m4 | ||
18 | +++ b/vapigen/vapigen.m4 | ||
19 | @@ -82,12 +82,12 @@ AC_DEFUN([VAPIGEN_CHECK], | ||
20 | |||
21 | AS_CASE([$enable_vala], | ||
22 | [yes], [ | ||
23 | - VAPIGEN=`$PKG_CONFIG --variable=vapigen $vapigen_pkg_name` | ||
24 | - VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir $vapigen_pkg_name`/vala/Makefile.vapigen | ||
25 | + VAPIGEN=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=vapigen $vapigen_pkg_name` | ||
26 | + VAPIGEN_MAKEFILE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=datadir $vapigen_pkg_name`/vala/Makefile.vapigen | ||
27 | AS_IF([test "x$2" = "x"], [ | ||
28 | - VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir $vapigen_pkg_name` | ||
29 | + VAPIGEN_VAPIDIR=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=vapidir $vapigen_pkg_name` | ||
30 | ], [ | ||
31 | - VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned $vapigen_pkg_name` | ||
32 | + VAPIGEN_VAPIDIR=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=vapidir_versioned $vapigen_pkg_name` | ||
33 | ]) | ||
34 | ]) | ||
35 | |||
36 | -- | ||
37 | 2.1.4 | ||
38 | |||
diff --git a/meta/recipes-devtools/vala/vala_0.54.4.bb b/meta/recipes-devtools/vala/vala_0.54.4.bb deleted file mode 100644 index 695f64e336..0000000000 --- a/meta/recipes-devtools/vala/vala_0.54.4.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require ${BPN}.inc | ||
2 | |||
3 | SRC_URI += " file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch" | ||
4 | |||
5 | SRC_URI[sha256sum] = "6051270a2fc30de023c88562566f2f6043e67beb4da4b799c14cdf12048eb40c" | ||
diff --git a/meta/recipes-devtools/vala/vala_0.54.6.bb b/meta/recipes-devtools/vala/vala_0.54.6.bb new file mode 100644 index 0000000000..d1202b83fd --- /dev/null +++ b/meta/recipes-devtools/vala/vala_0.54.6.bb | |||
@@ -0,0 +1,3 @@ | |||
1 | require ${BPN}.inc | ||
2 | |||
3 | SRC_URI[sha256sum] = "49d60d96a3fdf6c4287397442bc6d6d95bf40aa7df678ee49128c4b11ba6e469" | ||