[mlton] Fix for #914188 FTBFS

Adam Goode agoode at fedoraproject.org
Mon Apr 15 22:38:53 UTC 2013


commit be21d577163700af81786820290e65ffb4a452d9
Author: Adam Goode <adam at spicenitz.org>
Date:   Sun Apr 14 22:21:43 2013 -0400

    Fix for #914188 FTBFS
    
    - Update source link
    - Remove ExclusiveArch, per packaging recommendations

 mlton-20100608-no-gmp-const.patch |   15 +++++++++++++++
 mlton.spec                        |   21 ++++++++++++++-------
 2 files changed, 29 insertions(+), 7 deletions(-)
---
diff --git a/mlton-20100608-no-gmp-const.patch b/mlton-20100608-no-gmp-const.patch
new file mode 100644
index 0000000..f4e4bcd
--- /dev/null
+++ b/mlton-20100608-no-gmp-const.patch
@@ -0,0 +1,15 @@
+diff -ur mlton-20100608~/runtime/cenv.h mlton-20100608/runtime/cenv.h
+--- mlton-20100608~/runtime/cenv.h	2010-06-11 09:35:14.000000000 -0400
++++ mlton-20100608/runtime/cenv.h	2013-04-14 21:09:34.160392988 -0400
+@@ -137,6 +137,11 @@
+ #include "gmp.h"
+ #include "export.h"
+ 
++// __gmp_const is removed from newer versions of gmp
++#ifndef __gmp_const
++#define __gmp_const const
++#endif
++
+ COMPILE_TIME_ASSERT(sizeof_uintptr_t__is__sizeof_voidStar,
+                     sizeof(uintptr_t) == sizeof(void*));
+ COMPILE_TIME_ASSERT(sizeof_uintptr_t__is__sizeof_size_t,
diff --git a/mlton.spec b/mlton.spec
index a8ee561..97bd1d8 100644
--- a/mlton.spec
+++ b/mlton.spec
@@ -2,27 +2,25 @@
 
 Name:		mlton
 Version:	20100608
-Release:	8%{?dist}.2
+Release:	9%{?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}.src.tgz
+Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.src.tgz
 
 #Source1:	mlton-20070826-1.arm-linux.tgz
 
 Patch0:		mlton-20070826-no-execmem.patch
 Patch1:		mlton-20100608-no-execstack.patch
+Patch2:		mlton-20100608-no-gmp-const.patch
 
 BuildRequires:	gmp-devel htmldoc tex(latex)
 %if ! %{mlton_bootstrap}
 BuildRequires:	mlton
 %endif
 
-# bootstrapped only on these architectures
-ExclusiveArch:  %{ix86} x86_64 %{arm} ppc
-
 Requires:	gmp-devel gcc
 
 
@@ -49,10 +47,14 @@ multiprecision library, and lots of useful libraries.
 %setup -q
 
 # no execmem (Fedora specific)
-%patch0 -p1 -b .no-execmem
+%patch0 -p1
 
 # no execstack (already in upstream svn)
-%patch1 -p1 -b .no-execstack
+%patch1 -p1
+
+# __gmp_const is gone from recent gmp
+# https://github.com/MLton/mlton/issues/3
+%patch2 -p1
 
 %if %{mlton_bootstrap}
 %setup -T -D -q -a 1
@@ -87,6 +89,11 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/mlton/sml/ckit-lib/regression
 
 
 %changelog
+* Mon Apr 15 2013 Adam Goode <adam at spicenitz.org> - 20100608-9
+- Fix for #914188 FTBFS
+- Update source link
+- Remove ExclusiveArch, per packaging recommendations
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20100608-8.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list