[MLton-commit] r7323

[Wesley Terpstra]

Try again to get all buildds to accept mlton at once.


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

U   mlton/trunk/package/debian/changelog
U   mlton/trunk/package/debian/heap-size
U   mlton/trunk/package/debian/rules

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

Modified: mlton/trunk/package/debian/changelog
===================================================================
--- mlton/trunk/package/debian/changelog	2009-10-28 18:00:35 UTC (rev 7322)
+++ mlton/trunk/package/debian/changelog	2009-11-01 06:28:02 UTC (rev 7323)
@@ -1,3 +1,13 @@
+mlton (20091029) unstable; urgency=low
+
+  * Bump the heap-size up a bit to 800m (850m for align8) -> fixes s390.
+  * Without a porter box it's hard to find the cause of mips(el) build failure
+   * One likely in the gcc changelog is an ABI change in gcc 4.4
+   * Apparently the packed attribute behaves differently now
+   * Since the runtime uses this attribute, rebuild it using gcc 4.4 as well
+
+ -- Wesley W. Terpstra (Debian) <terpstra at debian.org>  Sun, 01 Nov 2009 07:19:14 +0100
+
 mlton (20091028) unstable; urgency=low
 
   * Added hurd memory-layout definition for mlnlffigen.

Modified: mlton/trunk/package/debian/heap-size
===================================================================
--- mlton/trunk/package/debian/heap-size	2009-10-28 18:00:35 UTC (rev 7322)
+++ mlton/trunk/package/debian/heap-size	2009-11-01 06:28:02 UTC (rev 7323)
@@ -2,10 +2,10 @@
 
 # MLton versions around 20091019 require 650m and 1.35g to build.
 # Earlier MLton versions (20070812)require slightly more.
-# The heap size needs to leave about 300m of physical RAM free.
+# The heap size needs to leave about 200m of physical RAM free.
 
 # Plan:
-#  32-bit builds use 700m or 1.5g (for 1GB and >= 2GB)
+#  32-bit builds use 800m or 1.5g (for 1GB and >= 2GB)
 #  64-bit builds use 1.7g or 3g   (for 2GB and >= 4GB)
 
 # Unfortunately, the debian buildds don't have that much memory
@@ -37,32 +37,32 @@
 #   => 1.5g
 # mips           -  1g (ball)
 #                -1.4g (mayr)
-#   => 700m heap
+#   => 800m heap
 # mipsel         -  1g (mayer)
 #                -0.5g (rem)                   UNUSABLE / black-listed
-#   => 700m heap
+#   => 800m heap
 # powerpc        -0.3g (voltaire)              UNUSABLE / black-listed
 #                -0.5g (malo)                  UNUSABLE / black-listed
 #                -  3g (praetorius)
 #   => 1.5g heap
 # s390           - ??? (31)
 #                -  1g (lxdebian) ... but fast swap?
-#   => 700m
+#   => 850m
 # sparc          -  2g (schroeder, lebrun, spontini)
 #   => 1.5g heap
 
 if dpkg-architecture -ealpha;          then result=3g;    fi
 if dpkg-architecture -eamd64;          then result=1.7g;  fi
 if dpkg-architecture -ehppa;           then result=1.5g;  fi
-if dpkg-architecture -ehurd-i386;      then result=700m;  fi
+if dpkg-architecture -ehurd-i386;      then result=800m;  fi
 if dpkg-architecture -ei386;           then result=1.5g;  fi
 if dpkg-architecture -eia64;           then result=3g;    fi
 if dpkg-architecture -ekfreebsd-amd64; then result=1.7g;  fi
 if dpkg-architecture -ekfreebsd-i386;  then result=1.5g;  fi
-if dpkg-architecture -emips;           then result=700m;  fi
-if dpkg-architecture -emipsel;         then result=700m;  fi
+if dpkg-architecture -emips;           then result=800m;  fi
+if dpkg-architecture -emipsel;         then result=800m;  fi
 if dpkg-architecture -epowerpc;        then result=1.5g;  fi
-if dpkg-architecture -es390;           then result=700m;  fi
+if dpkg-architecture -es390;           then result=850m;  fi
 if dpkg-architecture -esparc;          then result=1.5g;  fi
 
 # Default to more

Modified: mlton/trunk/package/debian/rules
===================================================================
--- mlton/trunk/package/debian/rules	2009-10-28 18:00:35 UTC (rev 7322)
+++ mlton/trunk/package/debian/rules	2009-11-01 06:28:02 UTC (rev 7323)
@@ -7,7 +7,7 @@
 HEAPSIZE := $(shell . debian/heap-size)
 
 # MLton compiles optimized, debug, and pic versions on its own.
-DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) make -C $(DEB_BUILDDIR)
+DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) make -C $(DEB_BUILDDIR) CC="gcc-4.4 -std=gnu99"
 
 # The MLton guide is html. Don't compress example .sml files.
 DEB_COMPRESS_EXCLUDE = mlton/guide .sml