[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. debian/2.4+dfsg-3-1-g5c2a494

[Mirco Bauer]

The following commit has been merged in the master branch:
commit 5c2a49427506a290452c148ba23a0fb05b52fe10
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sun Jun 14 16:54:35 2009 +0200

      * 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.

diff --git a/debian/changelog b/debian/changelog
index 88c3307..41fd1e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,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.
+
+ -- Mirco Bauer <meebey at debian.org>  Sun, 14 Jun 2009 16:52:28 +0200
+
 mono (2.4+dfsg-3) unstable; urgency=low
 
   * debian/control:
diff --git a/debian/rules b/debian/rules
index c4b7962..51d9e25 100755
--- a/debian/rules
+++ b/debian/rules
@@ -130,17 +130,13 @@ build-indep-stamp:
 
 test: test-arch
 test-arch: test-arch-stamp
-test-arch-stamp: configure-arch-stamp build-arch-stamp
-	# runtime tests need gmcs, ilasm and mkbundle, so let's build them
+test-arch-stamp: configure-indep
+	# we have to depend on configure-indep here because configure-arch
+	# passes --disable-mcs-build to ./configure which skips generating
+	# mcs/build/config.make which is required when we wan't to build
+	# assemblies here as thats where RUNTIME etc is defined.
 
-	# when --disable-mcs-build is passed to configure, it will not set
-	# the RUNTIME variable which is needed by the make files in mcs/
-	# so generate one with the needed variable when needed (config.make
-	# overrides configu-default.make variables)
-	if [ ! -f mcs/build/config.make ]; then \
-		echo "RUNTIME = $(CURDIR)/runtime/mono-wrapper" >> mcs/build/config.make; \
-		echo "MONO_VERSION = $(UPVERSION)" >> mcs/build/config.make; \
-	fi
+	# runtime tests need gmcs, ilasm and mkbundle, so let's build them
 
 	# bootstrap 1.1 needs basic
 	cd mcs && LC_ALL=C $(MAKE) EXTERNAL_MCS=false EXTERNAL_MONO=false PROFILE=basic
@@ -190,6 +186,8 @@ test-arch-stamp: configure-arch-stamp build-arch-stamp
 	# funny bug-459094.cs creates too long directory names which
 	# pbuilder is unable to remove, eh
 	cd mono/tests && rm -rf abcde12345abcde12345abcde12345abcde12345*
+	# delete the assemblies we built here, to make sure they get cleanly
+	# rebuild in the build-indep target
 	rm -rf \
 		mcs/class/lib/basic \
 		mcs/class/lib/net_1_1 \

-- 
mono