Author: blade
Date: 2004-07-04 09:45:04 -0600 (Sun, 04 Jul 2004)
New Revision: 1223
Modified:
mono/trunk/debian/changelog
mono/trunk/debian/control
mono/trunk/debian/rules
Log:
FTBFS workarounds for s390, arm, alpha
Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog 2004-07-04 15:27:03 UTC (rev 1222)
+++ mono/trunk/debian/changelog 2004-07-04 15:45:04 UTC (rev 1223)
@@ -1,3 +1,10 @@
+mono (1.0-2) UNRELEASED; urgency=low
+
+ * Workarounds for FTBFS on architectures that have we already built for in
+ the past
+
+ -- Debian Mono Group <pkg-mono-group@lists.alioth.debian.org> Sat, 3 Jul 2004 12:55:22 +0200
+
mono (1.0-1) unstable; urgency=low
* New upstream release (1.0 final)
Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control 2004-07-04 15:27:03 UTC (rev 1222)
+++ mono/trunk/debian/control 2004-07-04 15:45:04 UTC (rev 1223)
@@ -9,7 +9,7 @@
Package: mono-common
Provides: cli-common
-Architecture: arm powerpc s390 sparc i386
+Architecture: arm powerpc s390 sparc i386 alpha
Depends: binfmt-support (>= 1.1.2)
Conflicts: binfmt-detector-cli, cli-common
Replaces: mono-jit (<< 0.16), binfmt-detector-cli
@@ -23,7 +23,7 @@
Package: mono-jit
Provides: cli-virtual-machine
-Architecture: i386 powerpc s390
+Architecture: i386 powerpc
Depends: ${shlibs:Depends}, mono-assemblies-base-${mono:upversion} | mono-assemblies-base-0.96, mono-common (= ${Source-Version})
Description: fast CLI (.NET/Mono) JIT compiler
The Mono Project is an open development initiative sponsored by Ximian that is
@@ -37,7 +37,7 @@
Package: mono-mint
Provides: cli-virtual-machine
-Architecture: arm powerpc s390 sparc i386
+Architecture: arm powerpc s390 sparc i386 alpha
Conflicts: libmint0, libmint-dev
Replaces: libmint0, libmint-dev
Depends: ${shlibs:Depends}, mono-assemblies-base-${mono:upversion} | mono-assemblies-base-0.96, mono-common (= ${Source-Version})
@@ -66,7 +66,7 @@
Package: mono-utils
Section: devel
-Architecture: arm powerpc s390 sparc i386
+Architecture: arm powerpc s390 sparc i386 alpha
Depends: ${shlibs:Depends}, mono-assemblies-base
Description: Mono utilities
The Mono Project is an open development initiative sponsored by Ximian that is
@@ -79,7 +79,7 @@
Package: libmono0
Section: libs
-Architecture: i386 powerpc s390
+Architecture: i386 powerpc
Depends: ${shlibs:Depends}
Conflicts: libmint0
Provides: libmono-${mono:upversion}
@@ -94,7 +94,7 @@
Package: libmono-dev
Section: devel
-Architecture: i386 powerpc s390
+Architecture: i386 powerpc
Depends: libmono0 (= ${Source-Version}), libglib2.0-dev
Description: libraries for the Mono interpreter - Development files
Header files and static libraries for libmono and libmono-profiler-conv.
Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules 2004-07-04 15:27:03 UTC (rev 1222)
+++ mono/trunk/debian/rules 2004-07-04 15:45:04 UTC (rev 1223)
@@ -10,6 +10,21 @@
JIT="--with-jit=no"
endif
+ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH),s390)
+JIT="--with-jit=no"
+ATG="arch_target=s390"
+endif
+
+ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH),alpha)
+JIT="--with-jit=no"
+ATG="arch_target=alpha"
+endif
+
+ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH),arm)
+JIT="--with-jit=no"
+ATG="arch_target=arm"
+endif
+
VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\ -f2)
UPVERSION = $(shell echo $(VERSION) | sed 's,-.*,,')
@@ -31,7 +46,7 @@
--with-preview=yes
# we don't touch precompiled stuff
perl -pe 's,\ runtime\ , ,' -i Makefile
- $(MAKE)
+ $(MAKE) -j5 $(ATG)
( cat debian/mono-jit.postinst.head; ARCH= ; case `dpkg-architecture -qDEB_HOST_ARCH` in i386|powerpc|s390) cat debian/mono-jit.postinst.mono-setup ;; *) cat debian/mono-jit.postinst.mint-setup ;; esac ) > debian/mono-jit.postinst
touch build-stamp
@@ -59,14 +74,14 @@
dh_testroot
dh_clean -k
dh_installdirs
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+ $(MAKE) $(ATG) install DESTDIR=$(CURDIR)/debian/tmp
cd debian ; for x in dh_netdeps dh_makenetlibs dh_installxsp ; \
do chmod +x $$x; pod2man $$x > $$x.1 ; done
# removing trash (real assemblies/libs get build by the mcs source package)
rm -f $(CURDIR)/debian/tmp/usr/lib/mscorlib.dll
rm -rf $(CURDIR)/debian/tmp/usr/lib/mono
install -D -m755 cli-wrapper $(CURDIR)/debian/mono-common/usr/bin/cli-wrapper
- cd $(CURDIR)/debian/detector && $(MAKE) && install -D -m755 binfmt-detector-cli $(CURDIR)/debian/mono-common/usr/lib/cli/binfmt-detector-cli
+ cd $(CURDIR)/debian/detector && $(MAKE) $(ATG) && install -D -m755 binfmt-detector-cli $(CURDIR)/debian/mono-common/usr/lib/cli/binfmt-detector-cli
install -o root -g root -m 644 debian/cli.binfmt \
debian/mono-common/usr/share/binfmts/cli