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

[Mirco Bauer]

Author: meebey-guest
Date: 2005-05-14 16:59:23 +0000 (Sat, 14 May 2005)
New Revision: 1718

Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/control
   mono/trunk/debian/rules
Log:
- added amd64



Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2005-05-14 16:44:34 UTC (rev 1717)
+++ mono/trunk/debian/changelog	2005-05-14 16:59:23 UTC (rev 1718)
@@ -1,10 +1,11 @@
 mono (1.1.6-3) experimental; urgency=low
 
-  * NOT RELEASED YET
   * Mirco 'meebey' Bauer
     + updated "Section" fields in debian/control.
+    + added amd64 to the arch fields (Closes: #253542)
+      (thanks to Kurt Roeckx for testing it on AMD64)
 
- -- Debian Mono Group <pkg-mono-group@lists.alioth.debian.org>  Sun, 17 Apr 2005 21:19:58 +0200
+ -- Debian Mono Group <pkg-mono-group@lists.alioth.debian.org>  Sat, 14 May 2005 18:58:59 +0200
 
 mono (1.1.6-2) experimental; urgency=low
 

Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control	2005-05-14 16:44:34 UTC (rev 1717)
+++ mono/trunk/debian/control	2005-05-14 16:59:23 UTC (rev 1718)
@@ -8,8 +8,8 @@
 Standards-Version: 3.6.1
 
 Package: mono-common
-Architecture: i386 powerpc
-Depends: binfmt-support (>= 1.1.2), 
+Architecture: i386 powerpc amd64
+Depends: binfmt-support (>= 1.1.2)
 Description: common files for Mono
  Mono is a platform for running and developing applications based on the
  ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@ -21,8 +21,8 @@
 
 Package: mono-jit
 Provides: cli-virtual-machine
-Architecture: i386 powerpc
-Depends: mono-common (= ${Source-Version}), mono-assemblies-base-${mono:upversion}, ${shlibs:Depends},
+Architecture: i386 powerpc amd64
+Depends: mono-common (= ${Source-Version}), mono-assemblies-base-${mono:upversion}, ${shlibs:Depends}
 Description: fast CLI (.NET) JIT compiler for Mono
  Mono is a platform for running and developing applications based on the
  ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@ -31,11 +31,11 @@
  .
  This package contains the Virtual Execution Environment and code
  generator (Just-in-Time and Ahead-of-Time) "mono" which runs CLI (.NET)
- applications, currently available for i386 and powerpc architectures
+ applications, currently available for i386, powerpc and amd64 architectures
  only.
 
 Package: mono
-Architecture: i386 powerpc
+Architecture: i386 powerpc amd64
 Depends: mono-common (= ${Source-Version}), mono-jit (= ${Source-Version})
 Description: Mono CLI (.NET) runtime
  Mono is a platform for running and developing applications based on the
@@ -50,7 +50,7 @@
 
 Package: mono-devel
 Section: devel
-Architecture: i386 powerpc
+Architecture: i386 powerpc amd64
 Depends: mono (= ${Source-Version}), mono-mcs, mono-gac, mono-utils, mono-jay
 Description: Mono CLI (.NET) runtime with development tools
  Mono is a platform for running and developing applications based on the
@@ -63,7 +63,7 @@
 
 Package: mono-utils
 Section: devel
-Architecture: i386 powerpc
+Architecture: i386 powerpc amd64
 Depends: mono-common (= ${Source-Version}), mono-assemblies-base, ${shlibs:Depends}
 Provides: cil-disassembler
 Description: Mono utilities
@@ -77,7 +77,7 @@
 
 Package: libmono0
 Section: libs
-Architecture: i386 powerpc
+Architecture: i386 powerpc amd64
 Depends: mono-common (= ${Source-Version}), ${shlibs:Depends}
 Provides: libmono-${mono:upversion}
 Description: libraries for the Mono JIT
@@ -92,7 +92,7 @@
 
 Package: libmono-dev
 Section: devel
-Architecture: i386 powerpc
+Architecture: i386 powerpc amd64
 Depends: mono-common (= ${Source-Version}), libmono0 (= ${Source-Version}), libglib2.0-dev
 Description: libraries for the Mono JIT - Development files
  Header files and static libraries for libmono and libmono-profiler-conv.
@@ -120,7 +120,7 @@
 
 Package: mono-assemblies-arch
 Section: libs
-Architecture: i386 powerpc
+Architecture: i386 powerpc amd64
 Depends:  mono-assemblies-base-${mono:upversion}, ${gdi:Depends}, ${shlibs:Depends}
 Provides: mono-assemblies-arch-${mono:upversion}
 Description: architecture specific files for Mono's class library
@@ -167,7 +167,7 @@
 
 Package: mono-jay
 Section: devel
-Architecture: i386 powerpc
+Architecture: i386 powerpc amd64
 Depends: mono-common (= ${Source-Version}), ${shlibs:Depends}
 Description: LALR(1) parser generator oriented to Java/.NET
  Mono is a platform for running and developing applications based on the

Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules	2005-05-14 16:44:34 UTC (rev 1717)
+++ mono/trunk/debian/rules	2005-05-14 16:59:23 UTC (rev 1718)
@@ -13,11 +13,17 @@
 DEB_HOST_GNU_TYPE  := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-  confflags += --build $(DEB_HOST_GNU_TYPE)
+	confflags += --build $(DEB_HOST_GNU_TYPE)
 else
-  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+	confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
+ifeq ($(DEB_BUILD_ARCH), amd64)
+	confflags += --with-tls=__thread
+else
+	confflags += --with-tls=pthread
+endif
+
 # Include dpatch stuff.
 include /usr/share/dpatch/dpatch.make
 
@@ -30,9 +36,8 @@
 	./configure $(confflags) --prefix=/usr \
 	  --mandir=\$${prefix}/share/man \
 	  --infodir=\$${prefix}/share/info --sysconfdir=/etc \
-	  --with-sigaltstack=no --with-tls=pthread --with-gc=included \
+	  --with-sigaltstack=no --with-gc=included \
 	  --with-jit=yes --with-ikvm-native=yes
-	# --with-icu=yes 
 	$(MAKE)
 	touch build-stamp