mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@db180c0
This commit is contained in:
25
package/vala/0001-dont-add-dirty-to-valac-version.patch
Normal file
25
package/vala/0001-dont-add-dirty-to-valac-version.patch
Normal file
@@ -0,0 +1,25 @@
|
||||
valac: don't append -dirty to version
|
||||
|
||||
Don't append -dirty to the valac version number if the Buildroot Git
|
||||
tree has uncommited changes.
|
||||
|
||||
The patched script is meant for the valac developers, but it also
|
||||
activates if you build valac in a subdirectory of a Git tree (e.g.
|
||||
as is commonly done in Buildroot).
|
||||
|
||||
The effect is that valac gets built as being version x.y.z-dirty, which
|
||||
breaks programs (such as Midori) that explicitly check for valac-x.y.z.
|
||||
|
||||
Signed-off-by: Simon Dawson <spdawson@gmail.com>
|
||||
diff -Nur a/build-aux/git-version-gen b/build-aux/git-version-gen
|
||||
--- a/build-aux/git-version-gen 2010-08-15 12:49:03.000000000 +0100
|
||||
+++ b/build-aux/git-version-gen 2012-05-14 10:17:19.977204570 +0100
|
||||
@@ -135,7 +135,7 @@
|
||||
*) # Append the suffix only if there isn't one already.
|
||||
case $v in
|
||||
*-dirty) ;;
|
||||
- *) v="$v-dirty" ;;
|
||||
+ #*) v="$v-dirty" ;;
|
||||
esac ;;
|
||||
esac
|
||||
|
||||
2
package/vala/vala-wrapper
Normal file
2
package/vala/vala-wrapper
Normal file
@@ -0,0 +1,2 @@
|
||||
#!/bin/sh
|
||||
$0-@VALA_VERSION@ --vapidir=${STAGING_DIR}/usr/share/vala/vapi --girdir=${STAGING_DIR}/usr/share/gir-1.0 $@
|
||||
2
package/vala/vala.hash
Normal file
2
package/vala/vala.hash
Normal file
@@ -0,0 +1,2 @@
|
||||
# From https://download.gnome.org/sources/vala/0.34/vala-0.34.7.sha256sum
|
||||
sha256 1b2cb14f377d4c41fa3a86d3d01b93017015ce91b6714a85f27346073b4034fa vala-0.34.7.tar.xz
|
||||
32
package/vala/vala.mk
Normal file
32
package/vala/vala.mk
Normal file
@@ -0,0 +1,32 @@
|
||||
################################################################################
|
||||
#
|
||||
# vala
|
||||
#
|
||||
################################################################################
|
||||
|
||||
VALA_VERSION_MAJOR = 0.34
|
||||
VALA_VERSION = $(VALA_VERSION_MAJOR).7
|
||||
VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR)
|
||||
VALA_SOURCE = vala-$(VALA_VERSION).tar.xz
|
||||
VALA_LICENSE = LGPL-2.1+
|
||||
VALA_LICENSE_FILES = COPYING
|
||||
|
||||
HOST_VALA_DEPENDENCIES = host-bison host-flex host-libglib2
|
||||
# Yes, the autoconf script understands ':' as "xsltproc is not
|
||||
# available".
|
||||
HOST_VALA_CONF_ENV = ac_cv_path_XSLTPROC=:
|
||||
|
||||
# We wrap vala & valac to point to the proper gir and vapi data dirs
|
||||
# Otherwise we'll get host directory data which isn't enough
|
||||
define HOST_VALA_INSTALL_WRAPPER
|
||||
$(INSTALL) -D -m 0755 package/vala/vala-wrapper \
|
||||
$(HOST_DIR)/bin/vala
|
||||
$(INSTALL) -D -m 0755 package/vala/vala-wrapper \
|
||||
$(HOST_DIR)/bin/valac
|
||||
$(SED) 's,@VALA_VERSION@,$(VALA_VERSION_MAJOR),' \
|
||||
$(HOST_DIR)/bin/vala \
|
||||
$(HOST_DIR)/bin/valac
|
||||
endef
|
||||
HOST_VALA_POST_INSTALL_HOOKS += HOST_VALA_INSTALL_WRAPPER
|
||||
|
||||
$(eval $(host-autotools-package))
|
||||
Reference in New Issue
Block a user