[MLton-commit] r7314

[Wesley Terpstra]

Use the debian patch system to force mlton to use gcc-4.4 on debian.


----------------------------------------------------------------------

U   mlton/trunk/package/debian/control
A   mlton/trunk/package/debian/patches/
A   mlton/trunk/package/debian/patches/00-gcc-4.4.patch
U   mlton/trunk/package/debian/rules

----------------------------------------------------------------------

Modified: mlton/trunk/package/debian/control
===================================================================
--- mlton/trunk/package/debian/control	2009-10-28 15:40:35 UTC (rev 7313)
+++ mlton/trunk/package/debian/control	2009-10-28 15:45:54 UTC (rev 7314)
@@ -2,12 +2,12 @@
 Section: devel
 Priority: optional
 Maintainer: Wesley W. Terpstra (Debian) <terpstra at debian.org>
-Build-Depends: mlton (>= 20070826), gcc, htmldoc, libgmp3-dev (>= 4.0.1), texlive-latex-base, procps, debhelper (>= 7.0.0), cdbs (>= 0.4.52)
+Build-Depends: mlton (>= 20070826), gcc-4.4, htmldoc, libgmp3-dev (>= 4.0.1), texlive-latex-base, procps, debhelper (>= 7.0.0), cdbs (>= 0.4.52)
 Standards-Version: 3.8.3.0
 
 Package: mlton
 Architecture: alpha amd64 hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc s390 sparc
-Depends: ${shlibs:Depends}, gcc, libc6-dev, libgmp3-dev (>= 4.0.1)
+Depends: ${shlibs:Depends}, gcc-4.4, libc6-dev, libgmp3-dev (>= 4.0.1)
 Homepage: http://mlton.org/
 Description: Optimizing compiler for Standard ML
  MLton is a whole-program optimizing compiler

Added: mlton/trunk/package/debian/patches/00-gcc-4.4.patch
===================================================================
--- mlton/trunk/package/debian/patches/00-gcc-4.4.patch	2009-10-28 15:40:35 UTC (rev 7313)
+++ mlton/trunk/package/debian/patches/00-gcc-4.4.patch	2009-10-28 15:45:54 UTC (rev 7314)
@@ -0,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' mlton/bin/mlton-script mlton.new/bin/mlton-script
+--- mlton/bin/mlton-script	2009-10-15 21:39:37.000000000 +0200
++++ mlton.new/bin/mlton-script	2009-10-28 16:44:33.000000000 +0100
+@@ -7,7 +7,7 @@
+ dir=`dirname "$0"`
+ lib=`cd "$dir/../lib" && pwd`
+ eval `"$lib/platform"`
+-gcc='gcc'
++gcc='gcc-4.4'
+ case "$HOST_OS" in
+ mingw)
+ 	exe='.exe'

Modified: mlton/trunk/package/debian/rules
===================================================================
--- mlton/trunk/package/debian/rules	2009-10-28 15:40:35 UTC (rev 7313)
+++ mlton/trunk/package/debian/rules	2009-10-28 15:45:54 UTC (rev 7314)
@@ -2,6 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 HEAPSIZE := $(shell . debian/heap-size)