[mlton] Fix detection of ppc64, fix building on large-ram machines
Adam Goode
agoode at fedoraproject.org
Fri Apr 19 02:16:54 UTC 2013
commit 18330a0cc0f9523788d8429127157eb235404bc2
Author: Adam Goode <adam at spicenitz.org>
Date: Thu Apr 18 22:16:48 2013 -0400
Fix detection of ppc64, fix building on large-ram machines
mlton-20100608-ppc64-platform.patch | 13 +++++++++++++
mlton.spec | 13 +++++++++++--
2 files changed, 24 insertions(+), 2 deletions(-)
---
diff --git a/mlton-20100608-ppc64-platform.patch b/mlton-20100608-ppc64-platform.patch
new file mode 100644
index 0000000..c57e585
--- /dev/null
+++ b/mlton-20100608-ppc64-platform.patch
@@ -0,0 +1,13 @@
+diff -ur mlton-20100608~/bin/platform mlton-20100608/bin/platform
+--- mlton-20100608~/bin/platform 2010-06-11 13:35:30.000000000 +0000
++++ mlton-20100608/bin/platform 2013-04-18 02:37:26.666395665 +0000
+@@ -112,6 +112,9 @@
+ powerpc64)
+ HOST_ARCH=powerpc64
+ ;;
++ppc64)
++ HOST_ARCH=powerpc64
++;;
+ powerpc)
+ HOST_ARCH=powerpc
+ ;;
diff --git a/mlton.spec b/mlton.spec
index 97bd1d8..ae740ad 100644
--- a/mlton.spec
+++ b/mlton.spec
@@ -2,7 +2,7 @@
Name: mlton
Version: 20100608
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Optimizing compiler for Standard ML
Group: Development/Languages
@@ -15,6 +15,7 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.src.tgz
Patch0: mlton-20070826-no-execmem.patch
Patch1: mlton-20100608-no-execstack.patch
Patch2: mlton-20100608-no-gmp-const.patch
+Patch3: mlton-20100608-ppc64-platform.patch
BuildRequires: gmp-devel htmldoc tex(latex)
%if ! %{mlton_bootstrap}
@@ -56,6 +57,9 @@ multiprecision library, and lots of useful libraries.
# https://github.com/MLton/mlton/issues/3
%patch2 -p1
+# add proper detection for ppc64
+%patch3 -p1
+
%if %{mlton_bootstrap}
%setup -T -D -q -a 1
sed -i 's/\(^lib=\).*$/\1\$MLTON_BOOTSTRAP_DIR\/lib\/mlton/g' \
@@ -69,7 +73,7 @@ export MLTON_BOOTSTRAP_DIR=$(pwd)/usr
export PATH="${PATH}":$MLTON_BOOTSTRAP_DIR/bin
%endif
-make OPTFLAGS="$RPM_OPT_FLAGS"
+make OPTFLAGS="$RPM_OPT_FLAGS" RUNTIME_ARGS="max-heap 700M"
%install
@@ -89,6 +93,11 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/mlton/sml/ckit-lib/regression
%changelog
+* Thu Apr 18 2013 Adam Goode <adam at spicenitz.org> - 20100608-10
+- Constrain max-heap to a fixed value during building, otherwise 70% of physical
+ ram is used
+- Fix detection of ppc64
+
* Mon Apr 15 2013 Adam Goode <adam at spicenitz.org> - 20100608-9
- Fix for #914188 FTBFS
- Update source link
More information about the scm-commits
mailing list