[hyena] build: Bump mono dependency to 3.2.8
- From: Bertrand Lorentz <blorentz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [hyena] build: Bump mono dependency to 3.2.8
- Date: Sat, 9 May 2015 14:20:21 +0000 (UTC)
commit 229d3e81aa7b6aff3b6426f8a589590101a9b8cf
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date: Sat May 9 16:17:42 2015 +0200
build: Bump mono dependency to 3.2.8
As a first step, this allows us to just use the unified "mcs" compiler,
which simplifies our configure-time checks.
Hyena/Hyena.SExpEngine/tests/Makefile | 2 +-
build/build.rules.mk | 2 +-
build/m4/shamrock/mono.m4 | 26 +-------------------------
configure.ac | 10 +++++-----
4 files changed, 8 insertions(+), 32 deletions(-)
---
diff --git a/Hyena/Hyena.SExpEngine/tests/Makefile b/Hyena/Hyena.SExpEngine/tests/Makefile
index 0f5c3c9..213525e 100644
--- a/Hyena/Hyena.SExpEngine/tests/Makefile
+++ b/Hyena/Hyena.SExpEngine/tests/Makefile
@@ -4,7 +4,7 @@ ASSEMBLY = eval.exe
all: $(ASSEMBLY)
$(ASSEMBLY): $(SOURCES)
- gmcs -out:$@ $(SOURCES)
+ mcs -out:$@ $(SOURCES)
run: all
mono $(ASSEMBLY) list.sxp
diff --git a/build/build.rules.mk b/build/build.rules.mk
index 326a405..441a9db 100644
--- a/build/build.rules.mk
+++ b/build/build.rules.mk
@@ -55,7 +55,7 @@ $(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
$(MONO) $(top_builddir)/build/dll-map-verifier.exe $(srcdir)/$(notdir $ config) -iwinmm
-ilibc -ilibc.so.6 -iintl $(SOURCES_BUILD); \
fi;
$(MCS) \
- $(GMCS_FLAGS) \
+ $(MCS_FLAGS) \
$(ASSEMBLY_BUILD_FLAGS) \
$$warn \
-debug -target:$(TARGET) -out:$@ \
diff --git a/build/m4/shamrock/mono.m4 b/build/m4/shamrock/mono.m4
index 10c7eb3..f4db6ba 100644
--- a/build/m4/shamrock/mono.m4
+++ b/build/m4/shamrock/mono.m4
@@ -1,32 +1,8 @@
-AC_DEFUN([SHAMROCK_FIND_MONO_1_0_COMPILER],
+AC_DEFUN([SHAMROCK_FIND_MONO_COMPILER],
[
SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, mcs)
])
-AC_DEFUN([SHAMROCK_FIND_MONO_2_0_COMPILER],
-[
- SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, gmcs)
-])
-
-AC_DEFUN([SHAMROCK_FIND_MONO_2_0_COMPILER_OR_HIGHER],
-[
- if pkg-config --atleast-version=2.8 mono; then
- SHAMROCK_FIND_PROGRAM(MCS, dmcs)
- fi
- if test "x$MCS" = "x" ; then
- SHAMROCK_FIND_PROGRAM(MCS, gmcs)
- fi
-
- if test "x$MCS" = "x" ; then
- AC_MSG_ERROR([You need to install 'dmcs' or 'gmcs'])
- fi
-])
-
-AC_DEFUN([SHAMROCK_FIND_MONO_4_0_COMPILER],
-[
- SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, dmcs)
-])
-
AC_DEFUN([SHAMROCK_FIND_MONO_RUNTIME],
[
SHAMROCK_FIND_PROGRAM_OR_BAIL(MONO, mono)
diff --git a/configure.ac b/configure.ac
index ca25de1..10be1df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,9 +34,9 @@ AM_CONDITIONAL(ENABLE_RELEASE, test x$enable_release = xyes)
if test "x$enable_release" = "xyes" ; then
CONFIG_REQUESTED="yes"
else
- GMCS_FLAGS="-warnaserror"
+ MCS_FLAGS="-warnaserror"
fi
-AC_SUBST(GMCS_FLAGS)
+AC_SUBST(MCS_FLAGS)
AC_ARG_ENABLE(windows,
AC_HELP_STRING([--enable-windows],
@@ -51,9 +51,9 @@ if test -z "$CONFIG_REQUESTED" ; then
enable_debug=yes
fi
-dnl Mono and gmcs
-SHAMROCK_CHECK_MONO_MODULE(2.8.2)
-SHAMROCK_FIND_MONO_2_0_COMPILER_OR_HIGHER
+dnl Mono and mcs
+SHAMROCK_CHECK_MONO_MODULE(3.2.8)
+SHAMROCK_FIND_MONO_COMPILER
SHAMROCK_FIND_MONO_RUNTIME
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]