From 0652c81e3c7f93332c1cbc7a63c66361a9a6c6b8 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Mon, 29 Feb 2016 08:49:05 +0700 Subject: [PATCH] Re-enable ARM build with upstream cast fix --- gambit-c-4.8.4-fix-flonum-fixnum-cast.patch | 11 +++++++++++ gambit-c.spec | 11 ++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 gambit-c-4.8.4-fix-flonum-fixnum-cast.patch diff --git a/gambit-c-4.8.4-fix-flonum-fixnum-cast.patch b/gambit-c-4.8.4-fix-flonum-fixnum-cast.patch new file mode 100644 index 0000000..8176aab --- /dev/null +++ b/gambit-c-4.8.4-fix-flonum-fixnum-cast.patch @@ -0,0 +1,11 @@ +--- gambit-v4_8_4-devel/include/gambit.h.in.orig 2016-01-26 05:55:30.000000000 +0700 ++++ gambit-v4_8_4-devel/include/gambit.h.in 2016-02-29 00:03:00.880809119 +0700 +@@ -2962,7 +2962,7 @@ + + /* APPLY-able operations */ + +-#define ___F64TOFIX(x)___FIX(x) ++#define ___F64TOFIX(x)___FIX(___CAST(___WORD,x)) + #define ___F64FROMFIX(x)___INT(x) + #define ___F64_0 0.0 + #define ___F64POS(x)x diff --git a/gambit-c.spec b/gambit-c.spec index 01e3244..07b2b10 100644 --- a/gambit-c.spec +++ b/gambit-c.spec @@ -17,7 +17,7 @@ Name: gambit-c Version: 4.8.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Scheme programming system Group: Development/Languages @@ -26,6 +26,8 @@ URL: http://gambitscheme.org/ Source0: http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/%{_dirname}.tgz Source1: gambit-init.el Patch0: gambc-v4_2_8-modtime.patch +# from upstream https://github.com/feeley/gambit/commit/2d1792ce2c1c43efaa7369da4577787d92d9321d +Patch1: %{name}-4.8.4-fix-flonum-fixnum-cast.patch BuildRequires: emacs Requires: gcc @@ -33,10 +35,6 @@ Requires: emacs-filesystem >= %{_emacs_version} Obsoletes: emacs-gambit < 4.7.7-2 Obsoletes: emacs-gambit-el < 4.7.7-2 -# number->string issue; disabling until we know more -# https://github.com/feeley/gambit/issues/181 -# https://bugzilla.redhat.com/show_bug.cgi?id=1310438 -ExcludeArch: armv7hl %description Gambit-C includes a Scheme interpreter and a Scheme compiler which can @@ -180,6 +178,9 @@ fi %changelog +* Sun Feb 28 2016 Michel Alexandre Salim - 4.8.4-2 +- Re-enable ARM build with upstream cast fix + * Sun Feb 21 2016 Michel Alexandre Salim - 4.8.4-1 - Update to 4.8.4