[Pkg-mono-svn-commits] rev 3194 - mono/trunk/debian

[Mirco Bauer]

Author: meebey-guest
Date: 2007-06-12 23:33:05 +0000 (Tue, 12 Jun 2007)
New Revision: 3194

Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/rules
Log:
- ARM fix



Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2007-06-12 18:15:31 UTC (rev 3193)
+++ mono/trunk/debian/changelog	2007-06-12 23:33:05 UTC (rev 3194)
@@ -1,13 +1,17 @@
-mono (1.2.4-4) unstable; urgency=low
+mono (1.2.4-4) UNRELEASED; urgency=low
 
-  * debian/patches/g_thread_init.dpatch:
-    + Call g_thread_init() as early as possible as this is required for newer
-      glib versions. See:
-      http://bugzilla.ximian.com/show_bug.cgi?id=81862
-      http://bugzilla.gnome.org/show_bug.cgi?id=331853
-      Patch from upstream SVN, rev. 78018.
+  * Mirco 'meebey' Bauer:
+    + debian/rules:
+      - Use pthread for arm/armeb/armel, should fix FTBFS for ARM.
+  * Sebastian 'slomo' Dröge:
+    + debian/patches/g_thread_init.dpatch:
+      - Call g_thread_init() as early as possible as this is required for newer
+        glib versions. See:
+        http://bugzilla.ximian.com/show_bug.cgi?id=81862
+        http://bugzilla.gnome.org/show_bug.cgi?id=331853
+        Patch from upstream SVN, rev. 78018.
 
- -- Sebastian Dröge <slomo at debian.org>  Tue, 12 Jun 2007 20:11:05 +0200
+ -- Mirco Bauer <meebey at debian.org>  Wed, 13 Jun 2007 01:31:55 +0200
 
 mono (1.2.4-3) unstable; urgency=low
 

Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules	2007-06-12 18:15:31 UTC (rev 3193)
+++ mono/trunk/debian/rules	2007-06-12 23:33:05 UTC (rev 3194)
@@ -34,6 +34,16 @@
 	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
+else
+	CONF_FLAGS += --with-tls=__thread
+endif
+
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 endif
@@ -43,7 +53,6 @@
 		  --mandir=\$${prefix}/share/man \
 		  --infodir=\$${prefix}/share/info --sysconfdir=/etc \
 		  --with-jit=yes --with-ikvm-native=no --with-preview=yes \
-		  --with-tls=__thread \
 		  --with-libgdiplus=installed --with-x=yes
 
 # Include dpatch stuff.