From f7f87b8840f5997f65ddf643f26dde0ed5f6c308 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 2 May 2017 15:51:48 +0300 Subject: vala: upgrade to 0.36.2 Make libxslt-native dependency conditional on api-documentation distro feature, as vala now defaults to rebuilding the manual (which is slow). Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- meta/recipes-devtools/vala/vala.inc | 7 ++++++- meta/recipes-devtools/vala/vala_0.34.4.bb | 8 -------- meta/recipes-devtools/vala/vala_0.36.2.bb | 8 ++++++++ 3 files changed, 14 insertions(+), 9 deletions(-) delete mode 100644 meta/recipes-devtools/vala/vala_0.34.4.bb create mode 100644 meta/recipes-devtools/vala/vala_0.36.2.bb diff --git a/meta/recipes-devtools/vala/vala.inc b/meta/recipes-devtools/vala/vala.inc index b338ea097a..1261c02777 100644 --- a/meta/recipes-devtools/vala/vala.inc +++ b/meta/recipes-devtools/vala/vala.inc @@ -2,7 +2,12 @@ SUMMARY = "C#-like programming language for easing GObject programming" DESCRIPTION = "Vala is a C#-like language dedicated to ease GObject programming. \ Vala compiles to plain C and has no runtime environment nor penalities whatsoever." SECTION = "devel" -DEPENDS = "bison-native flex-native libxslt-native glib-2.0" +DEPENDS = "bison-native flex-native glib-2.0" + +# Appending libxslt-native to dependencies has an effect +# of rebuilding the manual, which is very slow. Let's do this +# only when api-documentation distro feature is enabled. +DEPENDS_append_class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'libxslt-native', '', d)}" # vala-native contains a native version of vapigen, which we use instead of the target one DEPENDS_append_class-target = " vala-native" diff --git a/meta/recipes-devtools/vala/vala_0.34.4.bb b/meta/recipes-devtools/vala/vala_0.34.4.bb deleted file mode 100644 index d1b49aea7d..0000000000 --- a/meta/recipes-devtools/vala/vala_0.34.4.bb +++ /dev/null @@ -1,8 +0,0 @@ -require ${BPN}.inc - -SRC_URI += " file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch \ - file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \ -" - -SRC_URI[md5sum] = "a856989d749fc5e472a3592b96f9ca48" -SRC_URI[sha256sum] = "6b17bd339414563ebc51f64b0b837919ea7552d8a8ffa71cdc837d25c9696b83" diff --git a/meta/recipes-devtools/vala/vala_0.36.2.bb b/meta/recipes-devtools/vala/vala_0.36.2.bb new file mode 100644 index 0000000000..9cea5b6a79 --- /dev/null +++ b/meta/recipes-devtools/vala/vala_0.36.2.bb @@ -0,0 +1,8 @@ +require ${BPN}.inc + +SRC_URI += " file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch \ + file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \ +" + +SRC_URI[md5sum] = "481774eb4f0f5aa6987e5ea30a0aea31" +SRC_URI[sha256sum] = "863dbfb399d59289dfc34379c0cd34d94e505a49787497550588810310cdf689" -- cgit 1.2.3-korg