[Pkg-mono-svn-commits] [SCM] mono branch, master-experimental, updated. debian/2.10.1-1-1-gaba0fce

Mirco Bauer meebey at meebey.net
Wed Apr 6 22:45:49 UTC 2011 

The following commit has been merged in the master-experimental branch:
commit aba0fce2abd5627084f2e943364b31fb172d571b
Author: Mirco Bauer <meebey at meebey.net>
Date:   Thu Apr 7 00:22:48 2011 +0200

    Dropped obsolete archs: arm, armeb and lpia; no longer supported arch: s390; added potential new archs: armhf, ppc64 and s390x; only build and install sgen on supported archs

diff --git a/debian/control b/debian/control
index a95bbf7..20224c3 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-mono/packages/mono.git
 
 Package: mono-runtime
 Provides: cli-runtime, cli-virtual-machine
-Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc
 Replaces: mono-common (<< 2.4), mono-jit (<< 2.4), libmono0 (<< 2.4)
 Conflicts: mono-common (<< 2.4),
            mono-jit (<< 2.4),
@@ -49,7 +49,7 @@ Description: Mono runtime
  IA64 architectures. Optionally this package configures BINFMT support.
 
 Package: mono-runtime-sgen
-Architecture: i386 lpia kfreebsd-i386 amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
+Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390x
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          mono-runtime (= ${binary:Version})
@@ -74,7 +74,7 @@ Description: Mono runtime - SGen (experimental)
 Package: mono-runtime-dbg
 Priority: extra
 Section: debug
-Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc
 Replaces: mono-jit-dbg (<< 2.4)
 Conflicts: mono-jit-dbg (<< 2.4)
 Depends: ${misc:Depends}, mono-runtime (= ${binary:Version})
@@ -90,7 +90,7 @@ Description: Mono runtime, debugging symbols
 
 Package: mono-utils
 Provides: cil-disassembler
-Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc
 Replaces: mono-mcs (<= 1.1.6-4)
 Depends: ${shlibs:Depends}, ${misc:Depends}, libmono-2.0-1 (= ${binary:Version}),
  libmono-corlib4.0-cil (= ${source:Version}) | libmono-corlib2.0-cil (= ${source:Version})
@@ -105,10 +105,10 @@ Description: Mono utilities
  pedump, monodis and monograph.
 
 Package: mono-complete
-Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc
 Depends: ${misc:Depends},
          mono-runtime (= ${binary:Version}),
-         mono-runtime-sgen (= ${binary:Version}) [!powerpc],
+         mono-runtime-sgen (= ${binary:Version}) [amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390x],
          libmono-2.0-1 (= ${binary:Version}),
          libmono-profiler (= ${binary:Version}),
          mono-utils (= ${binary:Version}),
@@ -143,7 +143,7 @@ Description: complete Mono runtime, development tools and all libraries
  You should build-depend on cli-common-dev and the needed libraries instead.
 
 Package: libmono-2.0-1
-Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc
 Replaces: libmono-dev (<= 1.1.6-4)
 Conflicts: mono-utils (<< 1.2.3.1-4)
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -159,7 +159,7 @@ Description: Mono JIT library
 Package: libmono-2.0-1-dbg
 Priority: extra
 Section: debug
-Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc
 Depends: ${misc:Depends}, libmono-2.0-1 (= ${binary:Version})
 Recommends: gdb
 Description: Mono JIT library, debugging symbols
@@ -172,7 +172,7 @@ Description: Mono JIT library, debugging symbols
  bytecode (aka assemblies), and a class library.
 
 Package: libmono-2.0-dev
-Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc
 Depends: ${misc:Depends}, libmono-2.0-1 (= ${binary:Version})
 Description: Mono JIT library - Development files
  Header files and static libraries for libmono-2.0.
@@ -184,7 +184,7 @@ Description: Mono JIT library - Development files
  bytecode (aka assemblies), and a class library.
 
 Package: libmono-profiler
-Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc
 Replaces: mono-runtime (<< 2.4.2.3)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Mono profiler libraries
@@ -2515,7 +2515,7 @@ Description: Mono GAC tool (for CLI 4.0)
  libraries, for CLI 4.0
 
 Package: mono-jay
-Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: LALR(1) parser generator oriented to Java/CLI
  Mono is a platform for running and developing applications based on the
diff --git a/debian/libmono-2.0-dev.install b/debian/libmono-2.0-dev.install
index 7b52d36..9fd6df7 100644
--- a/debian/libmono-2.0-dev.install
+++ b/debian/libmono-2.0-dev.install
@@ -2,3 +2,4 @@ usr/lib/libmono-2.0.so
 usr/lib/libmono-2.0.a
 usr/lib/pkgconfig/mono-2.pc
 usr/include/
+debian/mono-archs.make /usr/share/mono/
diff --git a/debian/mono-archs.make b/debian/mono-archs.make
new file mode 100644
index 0000000..27e82ae
--- /dev/null
+++ b/debian/mono-archs.make
@@ -0,0 +1,8 @@
+DEB_MONO_ARCHS = amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc
+# grep defined mono/metadata/sgen-archdep.h
+#elif defined(__x86_64__)
+#elif defined(__ppc__)
+#elif defined(__arm__)
+#elif defined(__s390x__)
+# mono with sgen FTBFS on powerpc
+DEB_MONO_SGEN_ARCHS = amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390x
diff --git a/debian/rules b/debian/rules
index 36aefb3..20e2614 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,8 @@
 #!/usr/bin/make -f
-
 #export DH_VERBOSE=1
 
+include debian/mono-archs.make
+
 # Assume Debian behaviour by default.
 DISTRO = $(shell lsb_release -si)
 
@@ -41,7 +42,11 @@ endif
 ifeq ($(DEB_BUILD_ARCH), powerpc)
 	# libgc with parallel mark FTBFS on ppc
 	CONF_FLAGS += --disable-parallel-mark
-	# mono with sgen FTBFS on ppc
+endif
+
+ifneq (,$(findstring $(DEB_BUILD_ARCH),$(DEB_MONO_SGEN_ARCHS)))
+	CONF_FLAGS += --with-sgen=yes
+else
 	CONF_FLAGS += --with-sgen=no
 endif
 

-- 
mono

More information about the Pkg-mono-svn-commits mailing list