mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00
Code Issues Projects Releases Wiki Activity

vala: upgrade 0.54.4 -> 0.54.6

Browse Source 
(From OE-Core rev: 69b7a80addb2febbc4a9cc6243135650abd25faf)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2022-01-19 11:41:04 +01:00
committed by Richard Purdie
parent 67d4b8e131
commit 051dda511b
3 changed files with 3 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/vala/vala/0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch
-38
View File
@@ -1,38 +0,0 @@
From dbb1c58e86f2af4613f3ac9571d9b163d4bca675 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 23 Oct 2015 16:13:54 +0300
Subject: [PATCH] vapigen.m4: use $PKG_CONFIG_SYSROOT_DIR
This is necessary in cross-compiling environments, where directories
returned by pkg-config should be prefixed with sysroot location.
Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/vala/-/merge_requests/218]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
vapigen/vapigen.m4 | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/vapigen/vapigen.m4 b/vapigen/vapigen.m4
index 2c435e7..6228991 100644
--- a/vapigen/vapigen.m4
+++ b/vapigen/vapigen.m4
@@ -82,12 +82,12 @@ AC_DEFUN([VAPIGEN_CHECK],
AS_CASE([$enable_vala],
[yes], [
- VAPIGEN=`$PKG_CONFIG --variable=vapigen $vapigen_pkg_name`
- VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir $vapigen_pkg_name`/vala/Makefile.vapigen
+ VAPIGEN=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=vapigen $vapigen_pkg_name`
+ VAPIGEN_MAKEFILE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=datadir $vapigen_pkg_name`/vala/Makefile.vapigen
AS_IF([test "x$2" = "x"], [
- VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir $vapigen_pkg_name`
+ VAPIGEN_VAPIDIR=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=vapidir $vapigen_pkg_name`
], [
- VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned $vapigen_pkg_name`
+ VAPIGEN_VAPIDIR=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=vapidir_versioned $vapigen_pkg_name`
])
])
--
2.1.4
meta/recipes-devtools/vala/vala_0.54.4.bb
-5
View File
@@ -1,5 +0,0 @@
require ${BPN}.inc
SRC_URI += " file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch"
SRC_URI[sha256sum] = "6051270a2fc30de023c88562566f2f6043e67beb4da4b799c14cdf12048eb40c"
meta/recipes-devtools/vala/vala_0.54.6.bb
+3
View File
@@ -0,0 +1,3 @@
require ${BPN}.inc
SRC_URI[sha256sum] = "49d60d96a3fdf6c4287397442bc6d6d95bf40aa7df678ee49128c4b11ba6e469"