Update ppc64 optimization hack

- Drop termite subpackages, they have been disabled for many releases

.gitignore

@@ -1 +1 @@
-/gambc-v4_6_1-devel.tgz
+/gambc-v4_6_6-devel.tgz

gambc-v4_6_6-reduce-opt.patch

@@ -0,0 +1,11 @@
+--- gambc-v4_6_6-devel/configure.reduce-opt	2012-05-24 00:18:43.000000000 +0700
++++ gambc-v4_6_6-devel/configure	2012-06-05 15:45:33.295482005 +0700
+@@ -22314,7 +22314,7 @@
+   case "$ENABLE_C_OPT" in
+ 
+      yes) if test "$DASH_O2" != ""; then
+-            OPT_LEVEL_FLAG="$DASH_O2"
++            OPT_LEVEL_FLAG="$DASH_O1"
+           fi
+           ;;
+ 

gambit-c.spec

@@ -1,13 +1,19 @@
-# Build options:
-#
-# --with termite
-#   The termite distributed programming system is currently broken
+%global dirname gambc-v4_6_6-devel
 
-%define dirname gambc-v4_6_1-devel
-%define termite_rev 080714_2216
+# Using -O2 on ppc64 triggers ICE with gcc
+# http://www.iro.umontreal.ca/~gambit/bugzilla/show_bug.cgi?id=155
+# https://bugzilla.redhat.com/show_bug.cgi?id=808285
+# Use --with ppc64opt2 when rebuilding to see if this is fixed
+%bcond_with ppc64opt2
+
+%ifarch ppc64
+%if ! %{with ppc64opt2}
+%global optflags %(echo %{optflags} | sed 's/-O2 /-O1 /')
+%endif
+%endif
 
 Name:           gambit-c
-Version:        4.6.1
+Version:        4.6.6
 Release:        1%{?dist}
 Summary:        Scheme programming system
 
@@ -15,15 +21,9 @@ Group:          Development/Languages
 License:        ASL 2.0 or LGPLv2
 URL:            http://www.iro.umontreal.ca/~gambit
 Source0:        http://www.iro.umontreal.ca/~gambit/download/gambit/v4.6/source/%{dirname}.tgz
-
-%if %{?_with_termite:1}%{!?_with_termite:0}
-Source1:        http://termite.googlecode.com/files/termite%{termite_rev}.tar.gz
-%else
-Provides:       gambit-c-termite = %{version}-%{release}
-Obsoletes:      gambit-c-termite < %{version}-%{release}
-%endif
-Source2:        gambit-init.el
+Source1:        gambit-init.el
 Patch0:         gambc-v4_2_8-modtime.patch
+Patch1:         gambc-v4_6_6-reduce-opt.patch
 
 BuildRequires:  emacs
 Requires:       gcc
@@ -49,12 +49,7 @@ Requires:       %{name} = %{version}-%{release}
 Requires(post):  info
 Requires(preun): info
 # switch to noarch
-Obsoletes:	gambit-c-doc < %{version}-%{release}
-%if %{?_with_termite:0}%{!?_with_termite:1}
-Provides:       gambit-c-termite-doc = %{version}-%{release}
-Obsoletes:      gambit-c-termite-doc < %{version}-%{release}
-%endif
-
+Obsoletes:      gambit-c-doc < %{version}-%{release}
 
 %description    doc
 Gambit-C includes a Scheme interpreter and a Scheme compiler which can
@@ -65,30 +60,6 @@ with a decent C compiler.
 This package contains the Gambit-C user manual in HTML and PDF formats.
 
 
-%if %{?_with_termite:1}%{!?_with_termite:0}
-%package        termite
-Summary:        Termite distributed programming system
-Group:          Development/Languages
-URL:            http://www.toute.ca/
-Requires:       %{name} = %{version}-%{release}
-
-
-%description    termite
-Termite is an Erlang-like distributed programming system written in Scheme.
-
-
-%package        termite-doc
-Summary:        Examples for the Termite distributed programming system
-Group:          Documentation
-Requires:       %{name}-termite = %{version}-%{release}
-
-%description    termite-doc
-Termite is an Erlang-like distributed programming system written in Scheme.
-
-This package contains examples and benchmarks for Termite.
-%endif
-
-
 %package -n emacs-gambit
 Summary:        Gambit-C editing mode for Emacs
 Group:          Applications/Editors
@@ -111,22 +82,21 @@ Elisp source file for the Gambit-C editing mode for Emacs.
 
 
 %prep
-%if %{?_with_termite:1}%{!?_with_termite:0}
-%setup -q -n %{dirname} -a1
-%else
 %setup -q -n %{dirname}
-%endif
 %patch0 -p1 -b .modtime
 
-#find . -name '*.scm' | xargs chmod 0644
-#find examples -name '*.scm' | xargs sed -i 's|/usr/local/Gambit-C|/usr|g'
+%ifarch ppc64
+%if ! %{with ppc64opt2}
+%patch1 -p1 -b .reduce-opt
+%endif
+%endif
+
 touch -r doc/gambit-c.info-2{,.tstamp}
 iconv -f iso88591 -t utf8 doc/gambit-c.info-2 -o doc/gambit-c.info-2.utf8
 touch -r doc/gambit-c.info-2{,.utf8}
 mv doc/gambit-c.info-2{.utf8,}
-#sed -i "s|\xE9|\xC3\xA9|g" doc/gambit-c.info-2
 # Permission fixes
-chmod -x lib/{mem.c,setup.h}
+chmod -x lib/*.{c,h}
 
 
 %build
@@ -165,34 +135,11 @@ rm -rf $RPM_BUILD_ROOT%{_prefix}/doc
 # Emacs mode files
 mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir}
 cp -p misc/gambit.elc $RPM_BUILD_ROOT%{_emacs_sitelispdir}
-cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_emacs_sitestartdir}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_emacs_sitestartdir}
 
 # Link static libs
 (cd $RPM_BUILD_ROOT%{_libdir} && ln -s %{name}/*.a .)
 
-%if %{?_with_termite:1}%{!?_with_termite:0}
-# Termite
-chmod 755 termite termite/examples
-chmod -R g+r-w,o+r termite
-cd termite
-mv tsi $RPM_BUILD_ROOT%{_bindir}
-
-# Fix script interpreters
-find benchmarks examples otp -name '*.scm' | xargs \
-  sed -i 's|/usr/local/Gambit-C/bin/gsi|/usr/bin/gsi|g'
-chmod +x otp/gen_event.scm
-
-# Move docs
-mkdir ../termite-doc ../termite-more-docs
-mv CHANGELOG LICENSE README VERSION ../termite-doc
-chmod a-x ../termite-doc/* ../termite-more-docs/benchmarks/*
-mv benchmarks examples ../termite-more-docs
-rm INSTALL
-cd ..
-
-mv termite $RPM_BUILD_ROOT%{_libdir}/%{name}/current/lib
-%endif
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -211,26 +158,12 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc LGPL.txt LICENSE-2.0.txt README
-%if %{?_with_termite:1}%{!?_with_termite:0}
-%exclude %{_bindir}/tsi
-%endif
 %{_bindir}/*
 %{_includedir}/*.h
 %{_mandir}/man1/gsi.*
-%if %{?_with_termite:1}%{!?_with_termite:0}
-%exclude %{_libdir}/%{name}/*/lib/termite
-%endif
 %{_libdir}/%{name}
 %{_libdir}/*.a
 
-%if %{?_with_termite:1}%{!?_with_termite:0}
-%files termite
-%defattr(-,root,root,-)
-%doc termite-doc/*
-%{_bindir}/tsi
-%{_libdir}/%{name}/v%{version}/lib/termite
-%endif
-
 %files -n emacs-gambit
 %defattr(-,root,root,-)
 %doc LGPL.txt LICENSE-2.0.txt
@@ -248,15 +181,26 @@ fi
 # examples
 %{_infodir}/*
 
-%if %{?_with_termite:1}%{!?_with_termite:0}
-%files termite-doc
-%defattr(-,root,root,-)
-%doc termite-more-docs/*
-%endif
-
 
 
 %changelog
+* Tue Jun  5 2012 Michel Salim <salimma@fedoraproject.org> - 4.6.6-1
+- Update to 4.6.6
+
+* Sat Mar 31 2012 Michel Salim <salimma@fedoraproject.org> - 4.6.5-2
+- Reduce optimization level on ppc64 to work around gcc compilation error
+
+* Thu Mar 29 2012 Michel Salim <salimma@fedoraproject.org> - 4.6.5-1
+- Update to 4.6.5
+- Drop termite subpackages, they have been disabled for many releases
+- Disable ppc64 target for now; broken since 4.6.4
+
+* Wed Feb 15 2012 Michel Salim <salimma@fedoraproject.org> - 4.6.4-1
+- Update to 4.6.4
+
+* Wed Feb  1 2012 Michel Salim <salimma@fedoraproject.org> - 4.6.3-1
+- Update to 4.6.3
+
 * Wed Jul 27 2011 Michel Salim <salimma@fedoraproject.org> - 4.6.1-1
 - Update to 4.6.1
 

sources

@@ -1 +1 @@
-7542cde52d4e24704bc49ba67d492f14  gambc-v4_6_1-devel.tgz
+55776c2f88cab9a595cbd9487f474787  gambc-v4_6_6-devel.tgz