From 179e54e239c4263a86d775c457d79a7a16cc1ffe44d06e7b317bb666aadf33f6 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Tue, 18 Dec 2007 17:28:13 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/clisp?expand=0&rev=6

---
 clisp.changes |  6 ++++++
 clisp.spec    | 40 ++++++++++++++++++++++++----------------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/clisp.changes b/clisp.changes
index d5fc712..61b0bc6 100644
--- a/clisp.changes
+++ b/clisp.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Dec 18 14:51:46 CET 2007 - werner@suse.de
+
+- Use -ffloat-store on on i386 to avoid the previous bug
+- Reorder -f options and -D defines of gcc
+
 -------------------------------------------------------------------
 Mon Dec 17 15:09:09 CET 2007 - werner@suse.de
 
diff --git a/clisp.spec b/clisp.spec
index 23a4671..a34c46b 100644
--- a/clisp.spec
+++ b/clisp.spec
@@ -25,7 +25,7 @@ Group:          Development/Languages/Other
 PreReq:         vim
 AutoReqProv:    on
 Version:        2.43
-Release:        1
+Release:        2
 Summary:        A Common Lisp Interpreter
 Url:            http://clisp.cons.org
 Source:         ftp://ftp.gnu.org/pub/gnu/clisp/latest/clisp-%{version}.tar.bz2
@@ -114,30 +114,35 @@ export PATH="$PATH:."
 # Set gcc command line but do not use CFLAGS
 #
 if test %debug = yes ; then
-    CC="g++ ${RPM_OPT_FLAGS}"
+    CC="g++"
 else
-    CC="gcc ${RPM_OPT_FLAGS}"
+    CC="gcc"
 fi
-%if %suse_version > 1030
-    CC="${CC} -fno-inline-small-functions"
-%endif
-MYCFLAGS="${MYCFLAGS} -g -fPIC -D_GNU_SOURCE -pipe"
-MYCFLAGS="${MYCFLAGS} -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
-MYCFLAGS="${MYCFLAGS} -fno-strict-aliasing -Wno-unused -Wno-uninitialized"
-cfi386='-falign-functions=4'
+CC="${CC} -g ${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC -pipe"
+case "$RPM_ARCH" in
+    i[0-9]86)	CC="${CC} -falign-functions=4 -mieee-fp -ffloat-store"	;;
+    ppc)	CC="${CC}"						;;
+    s390)	CC="${CC}"						;;
+    x86_64)	CC="${CC} -fno-gcse"					;;
+    sparc*)	CC="${CC} -fno-gcse"					;;
+    ppc64)	CC="${CC} -fno-gcse -mpowerpc64"			;;
+    s390x)	CC="${CC} -fno-gcse"					;;
+    ia64)	CC="${CC} -fno-gcse"					;;
+    axp|alpha)	CC="${CC}"						;;
+esac
 noexec='-DLINUX_NOEXEC_HEAPCODES'
 nommap='-DNO_MULTIMAP_SHM -DNO_MULTIMAP_FILE -DNO_SINGLEMAP -DNO_TRIVIALMAP'
-safety='-DSAFETY=3 -fno-gcse -O'
+safety='-DSAFETY=3 -O'
+MYCFLAGS="${MYCFLAGS} -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
+MYCFLAGS="${MYCFLAGS} -D_GNU_SOURCE -Wno-unused -Wno-uninitialized"
 case "$RPM_ARCH" in
-    i[0-9]86)	MYCFLAGS="${MYCFLAGS} ${cfi386} ${noexec}"		;;
+    i[0-9]86)	MYCFLAGS="${MYCFLAGS} ${noexec}"			;;
     ppc)	MYCFLAGS="${MYCFLAGS} ${noexec}"			;;
     s390)	MYCFLAGS="${MYCFLAGS} ${noexec}"			;;
     x86_64)	MYCFLAGS="${MYCFLAGS} ${safety}"			;;
     sparc*)	MYCFLAGS="${MYCFLAGS} ${safety}"			;;
-#   ppc64)	MYCFLAGS="${MYCFLAGS} ${safety} -DWIDE_HARD"	;;
-#   s390x)	MYCFLAGS="${MYCFLAGS} ${safety} -DWIDE_HARD"	;;
-    ppc64)	MYCFLAGS="${MYCFLAGS} ${safety}"	;;
-    s390x)	MYCFLAGS="${MYCFLAGS} ${safety}"	;;
+    ppc64)	MYCFLAGS="${MYCFLAGS} ${safety} -DWIDE_HARD"		;;
+    s390x)	MYCFLAGS="${MYCFLAGS} ${safety} -DWIDE_HARD"		;;
     ia64)	MYCFLAGS="${MYCFLAGS} ${safety}"			;;
     axp|alpha)	MYCFLAGS="${MYCFLAGS} ${nommap}"			;;
 esac
@@ -259,6 +264,9 @@ find  %{buildroot}${LSPLIB}/ -name '*.run' | xargs -r chmod 0755
 %doc %{_mandir}/man1/clisp.1.gz
 
 %changelog
+* Tue Dec 18 2007 - werner@suse.de
+- Use -ffloat-store on on i386 to avoid the previous bug
+- Reorder -f options and -D defines of gcc
 * Mon Dec 17 2007 - werner@suse.de
 - Add workaround to gcc bug in -O2 on i386
 * Fri Dec 14 2007 - werner@suse.de