[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. debian/2.4+dfsg-4-2-gfe80ff4

[Mirco Bauer]

The following commit has been merged in the master branch:
commit 86dceb1f4a0089e324b9bf2c2a998b7ebf79f597
Author: Mirco Bauer <meebey at meebey.net>
Date:   Mon Jun 22 00:18:11 2009 +0200

        + Let the build system decide if sigaltstack() will be used and which TLS
          instead of passing explicitly --with-sigaltstack and --with-tls to
          the ./configure script.

diff --git a/debian/changelog b/debian/changelog
index 41fd1e0..ff8d989 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,11 @@ mono (2.4+dfsg-4) unstable; urgency=low
   * debian/rules:
     + Removed the config.make hack as that broke AMD64 builds and instead let
       the ./configure script from the configure-indep target create that file.
+    + Let the build system decide if sigaltstack() will be used and which TLS
+      instead of passing explicitly --with-sigaltstack and --with-tls to
+      the ./configure script.
 
- -- Mirco Bauer <meebey at debian.org>  Sun, 14 Jun 2009 16:52:28 +0200
+ -- Mirco Bauer <meebey at debian.org>  Mon, 22 Jun 2009 00:08:35 +0200
 
 mono (2.4+dfsg-3) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 51d9e25..1bc9e01 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,22 +36,8 @@ ifeq ($(DEB_BUILD_ARCH_OS), kfreebsd)
         CONF_FLAGS += --enable-minimal=aot
 endif
 
-ifeq ($(DEB_BUILD_ARCH), i386)
-	CONF_FLAGS += --with-sigaltstack=yes
-else ifeq ($(DEB_BUILD_ARCH), amd64)
-	CONF_FLAGS += --with-sigaltstack=yes
-else
-	CONF_FLAGS += --with-sigaltstack=no
-endif
-
-ifeq ($(DEB_BUILD_ARCH), arm)
-	CONF_FLAGS += --with-tls=pthread
-else ifeq ($(DEB_BUILD_ARCH), armeb)
-	CONF_FLAGS += --with-tls=pthread
-else ifeq ($(DEB_BUILD_ARCH), armel)
-	CONF_FLAGS += --with-tls=pthread --with-fpu=NONE
-else
-	CONF_FLAGS += --with-tls=__thread
+ifeq ($(DEB_BUILD_ARCH), armel)
+	CONF_FLAGS += --with-fpu=NONE
 endif
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -61,9 +47,11 @@ else
 endif
 
 ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	TEST = true
+	MINI_TEST = true
+	MONO_TEST = true
 else
-	TEST = cd mono/tests && make test
+	MINI_TEST = cd mono/mini && make check
+	MONO_TEST = cd mono/tests && make test
 endif
 
 CONFIGURE =	CFLAGS="$(CFLAGS)" \
@@ -179,9 +167,11 @@ test-arch-stamp: configure-indep
 	cd mcs/class/System.Core && LC_ALL=C $(MAKE) PROFILE=net_2_0
 
 	# show time baby: run all tests
-	-$(TEST)
+	-$(MINI_TEST)
+	-$(MONO_TEST)
 
 	# clean up
+	cd mini/tests && $(MAKE) clean
 	cd mono/tests && $(MAKE) clean
 	# funny bug-459094.cs creates too long directory names which
 	# pbuilder is unable to remove, eh

-- 
mono