rpms/mlton/devel mlton.spec,1.12,1.13

[Adam Goode (agoode)]

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24565

Modified Files:
	mlton.spec 
Log Message:
* Thu Sep 13 2007 Adam Goode <adam at spicenitz.org> - 20070826-3
- Bootstrap x86_64



Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/mlton.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mlton.spec	28 Aug 2007 00:06:24 -0000	1.12
+++ mlton.spec	13 Sep 2007 23:33:47 -0000	1.13
@@ -1,18 +1,20 @@
 %define mlton_bootstrap 0
+%ifarch x86_64
+%define mlton_bootstrap 1
+%endif
 
 Name:		mlton
 Version:	20070826
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
 License:	MIT
 URL:		http://mlton.org/
 Source0:	http://mlton.org/pages/Download/attachments/%{name}-%{version}-1.src.tgz
+
 %if %{mlton_bootstrap}
-# taken from mlton_20060213-1 from Debian
-Source1:	mlton-bootstrap.i386.tar.bz2
-Source2:	mlton-bootstrap.ppc.tar.bz2
+Source1:	http://mlton.org/pages/Download/attachments/mlton-20070826-1.amd64-linux.tgz
 %endif
 
 Patch0:		mlton-20070826-debuginfo.patch
@@ -27,11 +29,8 @@
 
 Requires:	gmp-devel gcc
 
-# not yet available for 64-bit arch (#198764)
-ExcludeArch:	x86_64 ppc64
-
-# triggers GCC ICE on ppc (investigating...)
-ExcludeArch:	ppc
+# triggers GCC ICE on ppc (#268281)
+ExcludeArch:	ppc ppc64
 
 
 # description taken from the Debian package by Stephen Weeks
@@ -50,14 +49,9 @@
 %patch -P 0 -p1 -b .debuginfo
 
 %if %{mlton_bootstrap}
-%ifarch i386
 %setup -T -D -q -a 1
-%endif
-%ifarch ppc
-%setup -T -D -q -a 2
-%endif
-sed -i 's/\(^lib=\).*$/\1\$MLTON_BOOTSTRAP_DIR\/usr\/lib\/mlton/g'  \
-	bootstrap/usr/bin/mlton
+sed -i 's/\(^lib=\).*$/\1\$MLTON_BOOTSTRAP_DIR\/lib\/mlton/g'  \
+	usr/bin/mlton
 %endif
 
 # Filter unwanted Requires:
@@ -73,8 +67,8 @@
 
 %build
 %if %{mlton_bootstrap}
-export MLTON_BOOTSTRAP_DIR=$(pwd)/bootstrap
-export PATH="${PATH}":$MLTON_BOOTSTRAP_DIR/usr/bin
+export MLTON_BOOTSTRAP_DIR=$(pwd)/usr
+export PATH="${PATH}":$MLTON_BOOTSTRAP_DIR/bin
 %endif
 
 make OPTFLAGS="$RPM_OPT_FLAGS"
@@ -109,6 +103,9 @@
 
 
 %changelog
+* Thu Sep 13 2007 Adam Goode <adam at spicenitz.org> - 20070826-3
+- Bootstrap x86_64
+
 * Mon Aug 27 2007 Adam Goode <adam at spicenitz.org> - 20070826-2
 - Exclude ppc for now (GCC internal compiler error!)