diff options
Diffstat (limited to 'meta/recipes-devtools/vala')
-rw-r--r-- | meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch | 55 | ||||
-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.46.4.bb | 8 | ||||
-rw-r--r-- | meta/recipes-devtools/vala/vala_0.56.17.bb (renamed from meta/recipes-devtools/vala/vala.inc) | 39 |
4 files changed, 25 insertions, 115 deletions
diff --git a/meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch b/meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch deleted file mode 100644 index ac9dc8c83a..0000000000 --- a/meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 2460d7b79f7e90dcfeebde5e9c53d9b6798a1f3c Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Tue, 21 Feb 2012 17:12:50 +0100 -Subject: [PATCH] git-version-gen: don't append -dirty if we're not in git - repo - -* for example if we have some dirty directory and we unpack clean vala tarball in it, then it will append -dirty - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> - -Upstream-Status: Inappropriate [OE-Specific] ---- - build-aux/git-version-gen | 25 ++++++++++++++----------- - 1 files changed, 14 insertions(+), 11 deletions(-) - -diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen -index 0fa6faa..1d1f9d2 100755 ---- a/build-aux/git-version-gen -+++ b/build-aux/git-version-gen -@@ -126,18 +126,21 @@ fi - - v=`echo "$v" |sed 's/^v//'` - --# Don't declare a version "dirty" merely because a time stamp has changed. --git status > /dev/null 2>&1 -+if test -d .git -+then -+ # Don't declare a version "dirty" merely because a time stamp has changed. -+ git status > /dev/null 2>&1 - --dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty= --case "$dirty" in -- '') ;; -- *) # Append the suffix only if there isn't one already. -- case $v in -- *-dirty) ;; -- *) v="$v-dirty" ;; -- esac ;; --esac -+ dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty= -+ case "$dirty" in -+ '') ;; -+ *) # Append the suffix only if there isn't one already. -+ case $v in -+ *-dirty) ;; -+ *) v="$v-dirty" ;; -+ esac ;; -+ esac -+fi - - # Omit the trailing newline, so that m4_esyscmd can use the result directly. - echo "$v" | tr -d '\012' --- -1.7.8.4 - 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 ecab0fc1c9..0000000000 --- a/meta/recipes-devtools/vala/vala/0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch +++ /dev/null @@ -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: Pending [review in oe-core list] -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 - diff --git a/meta/recipes-devtools/vala/vala_0.46.4.bb b/meta/recipes-devtools/vala/vala_0.46.4.bb deleted file mode 100644 index c4cd6dd410..0000000000 --- a/meta/recipes-devtools/vala/vala_0.46.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] = "b79bbaf8929ec8ed35911b3571f5a248" -SRC_URI[sha256sum] = "4bb9b60fc0230b0db2c8a0e2a80ec29f1c10b43dc78355abba78adedbc2e03a1" diff --git a/meta/recipes-devtools/vala/vala.inc b/meta/recipes-devtools/vala/vala_0.56.17.bb index 703ed1aa8d..acd6c43096 100644 --- a/meta/recipes-devtools/vala/vala.inc +++ b/meta/recipes-devtools/vala/vala_0.56.17.bb @@ -1,33 +1,35 @@ SUMMARY = "C#-like programming language for easing GObject programming" +HOMEPAGE = "http://vala-project.org" 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 glib-2.0" +DEPENDS = "bison-native flex-native glib-2.0 gobject-introspection" # 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)}" +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" +DEPENDS:append:class-target = " vala-native" BBCLASSEXTEND = "native" -HOMEPAGE = "http://vala-project.org" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz" +SRC_URI[sha256sum] = "26100c4e4ef0049c619275f140d97cf565883d00c7543c82bcce5a426934ed6a" + inherit autotools pkgconfig upstream-version-is-even -FILES_${PN} += "${datadir}/${BPN}-${SHRT_VER}/vapi ${libdir}/${BPN}-${SHRT_VER}/" -FILES_${PN}-doc += "${datadir}/devhelp" +FILES:${PN} += "${datadir}/${BPN}-${SHRT_VER}/vapi ${libdir}/${BPN}-${SHRT_VER}/" +FILES:${PN}-doc += "${datadir}/devhelp" # .gir files from gobject-introspection are installed to ${libdir} when multilib is enabled GIRDIR_OPT = "${@'--girdir=${STAGING_LIBDIR}/gir-1.0' if d.getVar('MULTILIBS') else ''}" -do_configure_prepend_class-target() { +do_configure:prepend:class-target() { # Write out a vapigen wrapper that will be provided by pkg-config file installed in target sysroot # The wrapper will call a native vapigen cat > ${B}/vapigen-wrapper << EOF @@ -41,22 +43,31 @@ EXTRA_OECONF += " --disable-valadoc" # Vapigen wrapper needs to be available system-wide, because it will be used # to build vapi files from all other packages with vala support -do_install_append_class-target() { - install -d ${D}${bindir}/ - install ${B}/vapigen-wrapper ${D}${bindir}/ +do_install:append:class-target() { + install -d ${D}${bindir_crossscripts}/ + install ${B}/vapigen-wrapper ${D}${bindir_crossscripts}/ } # Put vapigen wrapper into target sysroot so that it can be used when building # vapi files. -SYSROOT_DIRS_append_class-target = " ${bindir}" +SYSROOT_DIRS += "${bindir_crossscripts}" + +inherit multilib_script +MULTILIB_SCRIPTS = "${PN}:${bindir}/vala-gen-introspect-0.56" -SYSROOT_PREPROCESS_FUNCS_append_class-target = " vapigen_sysroot_preprocess" +SYSROOT_PREPROCESS_FUNCS:append:class-target = " vapigen_sysroot_preprocess" vapigen_sysroot_preprocess() { # Tweak the vapigen name in the vapigen pkgconfig file, so that it picks # up our wrapper. sed -i \ - -e "s|vapigen=.*|vapigen=${bindir}/vapigen-wrapper|" \ + -e "s|vapigen=.*|vapigen=${bindir_crossscripts}/vapigen-wrapper|" \ ${SYSROOT_DESTDIR}${libdir}/pkgconfig/vapigen-${SHRT_VER}.pc } SSTATE_SCAN_FILES += "vapigen-wrapper" + +PACKAGE_PREPROCESS_FUNCS += "vala_package_preprocess" + +vala_package_preprocess () { + rm -rf ${PKGD}${bindir_crossscripts} +} |