[gnome-code-assistance/wip/lantw/update-llvm-and-vala-versions] build: Update LLVM and Vala versions
- From: Ting-Wei Lan <lantw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-code-assistance/wip/lantw/update-llvm-and-vala-versions] build: Update LLVM and Vala versions
- Date: Sun, 6 Oct 2019 13:32:28 +0000 (UTC)
commit 0fd8b5f705fb7c88e6a8f9deaad30585df634bf4
Author: Ting-Wei Lan <lantw src gnome org>
Date: Wed Oct 3 23:52:07 2018 +0800
build: Update LLVM and Vala versions
backends/vala/valaoptionparser.vala | 8 ++++++++
configure.ac | 12 +++++++++---
2 files changed, 17 insertions(+), 3 deletions(-)
---
diff --git a/backends/vala/valaoptionparser.vala b/backends/vala/valaoptionparser.vala
index 5ca5643..916ddcb 100644
--- a/backends/vala/valaoptionparser.vala
+++ b/backends/vala/valaoptionparser.vala
@@ -217,6 +217,13 @@ class OptionParser {
context.add_define ("VALA_0_%d".printf (i));
}
+#if VALA_0_44
+ if (target_glib == null) {
+ target_glib = "2.18";
+ }
+
+ context.set_target_glib_version(target_glib);
+#else
int glib_major = 2;
int glib_minor = 18;
@@ -234,6 +241,7 @@ class OptionParser {
for (int i = 16; i <= glib_minor; i += 2) {
context.add_define ("GLIB_2_%d".printf (i));
}
+#endif
if (!nostdpkg) {
/* default packages */
diff --git a/configure.ac b/configure.ac
index 12735b4..42fcb09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,6 +97,9 @@ AC_ARG_ENABLE([c],
if test "x$enable_c" = "xauto"; then
AC_PATH_PROGS([LLVM_CONFIG], [ \
+ llvm-config-9 llvm-config90 \
+ llvm-config-8 llvm-config80 \
+ llvm-config-7 llvm-config70 \
llvm-config-6.0 llvm-config60 \
llvm-config-5.0 llvm-config50 \
llvm-config-4.0 llvm-config40 \
@@ -106,7 +109,7 @@ if test "x$enable_c" = "xauto"; then
llvm-config-3.6 llvm-config36 \
llvm-config-3.5 llvm-config35 \
llvm-config \
- llvm-config-7 llvm-config-devel])
+ llvm-config-10 llvm-config-devel])
AC_MSG_CHECKING([c backend])
@@ -119,6 +122,9 @@ if test "x$enable_c" = "xauto"; then
fi
elif test "x$enable_c" != "xno"; then
AC_PATH_PROGS([LLVM_CONFIG], [ \
+ llvm-config-9 llvm-config90 \
+ llvm-config-8 llvm-config80 \
+ llvm-config-7 llvm-config70 \
llvm-config-6.0 llvm-config60 \
llvm-config-5.0 llvm-config50 \
llvm-config-4.0 llvm-config40 \
@@ -128,7 +134,7 @@ elif test "x$enable_c" != "xno"; then
llvm-config-3.6 llvm-config36 \
llvm-config-3.5 llvm-config35 \
llvm-config \
- llvm-config-7 llvm-config-devel])
+ llvm-config-10 llvm-config-devel])
AC_MSG_CHECKING([c backend])
@@ -462,7 +468,7 @@ AC_ARG_ENABLE([vala],
[enable_vala=$enableval],
[enable_vala=auto])
-BACKEND_VALA_LIBVALA_VERSIONS="libvala-0.42 libvala-0.40 libvala-0.38 libvala-0.36 libvala-0.34 libvala-0.32
libvala-0.30 libvala-0.28 libvala-0.26 libvala-0.24 libvala-0.22 libvala-0.20"
+BACKEND_VALA_LIBVALA_VERSIONS="libvala-0.48 libvala-0.46 libvala-0.44 libvala-0.42 libvala-0.40 libvala-0.38
libvala-0.36 libvala-0.34 libvala-0.32 libvala-0.30 libvala-0.28 libvala-0.26 libvala-0.24 libvala-0.22
libvala-0.20"
BACKEND_VALA_MODULES="gobject-2.0 >= 2.36 glib-2.0 >= 2.36 gio-2.0 >= 2.36 gee-0.8 gio-unix-2.0 >= 2.36"
BACKEND_VALA_LIBVALA=
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]