jflack
/
copr-clisp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add -gcc5 patch to fix 32-bit build with gcc 5.0.

This commit is contained in:
Jerry James 2015-02-11 20:01:29 -07:00
parent 643035ba3b
commit 9db12fddf3
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
clisp-gcc5.patch Normal file
View File

@ -0,0 +1,38 @@
--- ./src/makemake.in.orig 2013-02-16 15:26:28.000000000 -0700
+++ ./src/makemake.in 2015-02-11 17:20:00.000000000 -0700
@@ -1217,7 +1217,7 @@ if [ $XCC_GCC = true ] ; then
if [ $CROSS = false ] ; then
case "$XCC_GCC_VERSION" in
# gcc 2.7 introduced an annoying warning, but gcc 2.8 has a workaround:
- 2.[8-9]* | 3.* | 4.* | egcs-2.*)
+ 2.[8-9]* | 3.* | 4.* | 5.* | egcs-2.*)
XCFLAGS=$XCFLAGS' -Wno-sign-compare -Wno-format-nonliteral'
;;
* ) ;;
@@ -1226,7 +1226,7 @@ if [ $XCC_GCC = true ] ; then
if [ $CROSS = false -a $CC_CPLUSPLUS = true ] ; then
case "$XCC_GCC_VERSION" in
# g++ 3.4 introduced an annoying warning, but has a workaround:
- 3.[4-9]* | 4.*)
+ 3.[4-9]* | 4.* | 5.*)
XCFLAGS=$XCFLAGS' -Wno-invalid-offsetof'
;;
* ) ;;
@@ -1241,7 +1241,7 @@ if [ $XCC_GCC = true ] ; then
# gcc-2.7.2 has a strength-reduction bug (fixed in gcc-2.7.2.1,
# also fixed through the specs file of some Linux distributions).
XCFLAGS=$XCFLAGS' -O2 -fexpensive-optimizations -fno-strength-reduce' ;;
- 2.3.[2-9]* | 2.[4-9]* | 3.* | 4.* | egcs-2.*)
+ 2.3.[2-9]* | 2.[4-9]* | 3.* | 4.* | 5.* | egcs-2.*)
XCFLAGS=$XCFLAGS' -O2 -fexpensive-optimizations' ;;
* )
XCFLAGS=$XCFLAGS' -O' ;;
@@ -1295,7 +1295,7 @@ if [ $XCC_GCC = true ] ; then
esac
fi # with_debug
case "$XCC_GCC_VERSION" in
- 3* | 4*)
+ 3* | 4* | 5*)
# When not optimizing on linux, or with Apple's gcc 4 on MacOS X,
# or with GCC 4 when "gcc -Os" is used:
# C_CODE_ALIGNMENT is wrong. &EVAL-WHEN = 0x806D512

4
clisp.spec
View File

@ -27,6 +27,8 @@ Patch2: %{name}-libsvm.patch
Patch3: %{name}-db.patch
# Linux-specific fixes. Sent upstream 25 Jul 2012.
Patch4: %{name}-linux.patch
# Adapt to GCC 5.x
Patch5: %{name}-gcc5.patch
BuildRequires: compat-readline5-devel
BuildRequires: dbus-devel
BuildRequires: emacs
@ -97,6 +99,7 @@ Files necessary for linking CLISP programs.
%patch2
%patch3
%patch4
%patch5
# Convince CLisp to build against compat-readline5 instead of readline.
# This is to avoid pulling the GPLv3 readline 6 into a GPLv2 CLisp binary.
@ -317,6 +320,7 @@ chmod a+x \
%changelog
* Wed Feb 11 2015 Jerry James <loganjerry@gmail.com> - 2.49-15.20130208hg
- Add -gcc5 patch to fix 32-bit build with gcc 5.0
- Use license macro
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.49-14.20130208hg