[mlton] Try a more generalized bootstrap approach
Adam Goode
agoode at fedoraproject.org
Sun Apr 21 02:19:33 UTC 2013
commit 54e220496ab090e80a2854be3cdfbcca2bb02373
Author: Adam Goode <adam at spicenitz.org>
Date: Sat Apr 20 22:19:22 2013 -0400
Try a more generalized bootstrap approach
.gitignore | 1 +
mlton.spec | 22 ++++++++++++++++------
sources | 1 +
3 files changed, 18 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4df8baf..3c04578 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/mlton-20100608.src.tgz
/mlton-20100608.ppc64.tar.xz
+/mlton-20100608.ppc.tar.xz
diff --git a/mlton.spec b/mlton.spec
index 3b580e9..cb733a7 100644
--- a/mlton.spec
+++ b/mlton.spec
@@ -1,8 +1,8 @@
-%global mlton_bootstrap 1
+%global mlton_bootstrap 0
Name: mlton
Version: 20100608
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: Optimizing compiler for Standard ML
Group: Development/Languages
@@ -17,10 +17,17 @@ Patch3: mlton-20100608-ppc64-platform.patch
BuildRequires: gmp-devel htmldoc tex(latex)
-%if %{mlton_bootstrap}
+%ifarch ppc
+%global mlton_bootstrap 1
+Source1: mlton-20100608.ppc.tar.xz
+%endif
+
+%ifarch ppc64
+%global mlton_bootstrap 1
Source1: mlton-20100608.ppc64.tar.xz
-ExclusiveArch: ppc64
-%else
+%endif
+
+%if !%{mlton_bootstrap}
BuildRequires: mlton
%endif
@@ -65,7 +72,7 @@ multiprecision library, and lots of useful libraries.
%if %{mlton_bootstrap}
%setup -T -D -q -a 1
-sed -i 's/\(^lib=\).*$/\1\$MLTON_BOOTSTRAP_DIR\/lib64\/mlton/g' \
+sed -i 's/\(^lib=\).*$/\1\$MLTON_BOOTSTRAP_DIR\/%{_lib}\/mlton/g' \
usr/bin/mlton
%endif
@@ -107,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/mlton/sml/ckit-lib/regression
%changelog
+* Sun Apr 21 2013 Adam Goode <adam at spicenitz.org> - 20100608-15
+- Try a more generalized bootstrap approach
+
* Sat Apr 20 2013 Adam Goode <adam at spicenitz.org> - 20100608-14
- Really fix builds by more intelligently setting max-heap
diff --git a/sources b/sources
index 30721c9..e8e3327 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
8c53b68492a8aa41de06d35dc0e9d8fa mlton-20100608.src.tgz
e86ad7f99c4215bafa514ec59b2feba8 mlton-20100608.ppc64.tar.xz
+87e3ced9fc2f0a896860bd63c232af4b mlton-20100608.ppc.tar.xz
More information about the scm-commits
mailing list