[MLton-commit] r7414

[Wesley Terpstra]

Adjust build rules to satisfy all the targets


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

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	2010-02-08 17:06:12 UTC (rev 7413)
+++ mlton/trunk/package/debian/changelog	2010-02-13 12:43:08 UTC (rev 7414)
@@ -1,3 +1,11 @@
+mlton (20100206~svn-r7414) unstable; urgency=low
+
+  * s390 and hurd need fixed-heap to stop thrashing on resize
+  * qemu'd armel needs max-heap to work-around mmap emulation problems
+   => heap-size must choose {fixed/max}-heap
+
+ -- Wesley W. Terpstra (Debian) <terpstra at debian.org>  Mon, 08 Feb 2010 20:22:20 +0100
+
 mlton (20100206~svn-r7412) unstable; urgency=low
 
   * Restored -fPIC work-around and reopened #552314.

Modified: mlton/trunk/package/debian/heap-size
===================================================================
--- mlton/trunk/package/debian/heap-size	2010-02-08 17:06:12 UTC (rev 7413)
+++ mlton/trunk/package/debian/heap-size	2010-02-13 12:43:08 UTC (rev 7414)
@@ -39,23 +39,23 @@
 #                -  1g (lxdebian) ... but fast swap?
 # sparc          -  2g (schroeder, lebrun, spontini)
 
-if dpkg-architecture -ealpha;          then result=3g;    fi
-if dpkg-architecture -eamd64;          then result=1.7g;  fi
-if dpkg-architecture -earmel;          then result=850m;  fi
-if dpkg-architecture -ehppa;           then result=1.5g;  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=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=850m;  fi
-if dpkg-architecture -esparc;          then result=1.5g;  fi
+if dpkg-architecture -ealpha;          then result="fixed-heap 3g";    fi
+if dpkg-architecture -eamd64;          then result="fixed-heap 1.7g";  fi
+if dpkg-architecture -earmel;          then result="max-heap   850m";  fi
+if dpkg-architecture -ehppa;           then result="fixed-heap 1.5g";  fi
+if dpkg-architecture -ehurd-i386;      then result="fixed-heap 800m";  fi
+if dpkg-architecture -ei386;           then result="fixed-heap 1.5g";  fi
+if dpkg-architecture -eia64;           then result="fixed-heap 3g";    fi
+if dpkg-architecture -ekfreebsd-amd64; then result="fixed-heap 1.7g";  fi
+if dpkg-architecture -ekfreebsd-i386;  then result="fixed-heap 1.5g";  fi
+if dpkg-architecture -emips;           then result="fixed-heap 800m";  fi
+if dpkg-architecture -emipsel;         then result="fixed-heap 800m";  fi
+if dpkg-architecture -epowerpc;        then result="fixed-heap 1.5g";  fi
+if dpkg-architecture -es390;           then result="fixed-heap 850m";  fi
+if dpkg-architecture -esparc;          then result="fixed-heap 1.5g";  fi
 
-# Default to more
-if test -z "$result"; then result=2g; echo "Warning: Unknown architecture." >&2; fi
+# Warn by default
+if test -z "$result"; echo "Warning: Unknown architecture." >&2; fi
 
 # Allow buildd admin to override heap-size with environment variable
 if test -n "$DEB_BUILD_HEAP"; then result="$DEB_BUILD_HEAP"; fi

Modified: mlton/trunk/package/debian/rules
===================================================================
--- mlton/trunk/package/debian/rules	2010-02-08 17:06:12 UTC (rev 7413)
+++ mlton/trunk/package/debian/rules	2010-02-13 12:43:08 UTC (rev 7414)
@@ -13,7 +13,7 @@
 DEB_COMPRESS_EXCLUDE = mlton/guide .sml
 
 DEB_MAKE_CLEAN_TARGET   = clean clean-svn
-DEB_MAKE_BUILD_TARGET   = all RUNTIME_ARGS="max-heap $(HEAPSIZE)"
+DEB_MAKE_BUILD_TARGET   = all RUNTIME_ARGS="$(HEAPSIZE)"
 DEB_MAKE_INSTALL_TARGET = install-no-strip DESTDIR=$(CURDIR)/debian/tmp/ PREFIX=/usr MAN_PREFIX_EXTRA=/share
 DEB_MAKE_CHECK_TARGET   = check