[Pkg-mono-svn-commits] [SCM] mono branch, master-experimental, updated. debian/2.6.7-5-42-gde8c9aa

[Mirco Bauer]

The following commit has been merged in the master-experimental branch:
commit c31f6e2d2f70ec4bfe7aeedb67a1e21fd9cedda8
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sat Jan 29 15:38:49 2011 +0100

    Stick to upstream's configure defaults except for ikvm and quiet builds

diff --git a/debian/rules b/debian/rules
index 72ad752..f660ef4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,9 +38,6 @@ endif
 
 ifeq ($(DEB_BUILD_ARCH), armel)
 	CONF_FLAGS += --with-fpu=NONE
-	# the build-system picks __thread for armel which is not working,
-	# thus we have to explicitly pick pthread
-	CONF_FLAGS += --with-tls=pthread
 endif
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -70,12 +67,8 @@ CONFIGURE =	CFLAGS="$(CFLAGS)" \
 		./configure $(CONF_FLAGS) --prefix=/usr \
 		  --mandir=\$${prefix}/share/man \
 		  --infodir=\$${prefix}/share/info --sysconfdir=/etc \
-		  --with-jit=yes --with-ikvm-native=no --with-preview=yes \
-		  --with-libgdiplus=installed --with-x=yes \
-		  --with-profile4=no \
-		  --with-moonlight=no \
-		  --enable-quiet-build=no \
-		  --disable-shared-handles
+		  --with-ikvm-native=no \
+		  --disable-quiet-build
 
 # Mono's build system doesn't like -j > 1
 MAKE_FLAGS += -j1

-- 
mono