[gentoo-commits] repo/gentoo:master commit in: dev-lisp/gcl/, dev-lisp/gcl/files/

[Andrey Grozin]

commit:     537acbec9ddd8856a4c226b5c032e3bafcf3da31
Author:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 17 17:29:52 2016 +0000
Commit:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 17:29:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=537acbec

dev-lisp/gcl: 2.6.12 now uilds with gcc-5

Bug: 574652

Package-Manager: portage-2.2.27

 dev-lisp/gcl/files/gcl-2.6.12-gcc5.patch | 8 ++++++++
 dev-lisp/gcl/gcl-2.6.12.ebuild           | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/dev-lisp/gcl/files/gcl-2.6.12-gcc5.patch 
b/dev-lisp/gcl/files/gcl-2.6.12-gcc5.patch
new file mode 100644
index 0000000..07d3892
--- /dev/null
+++ b/dev-lisp/gcl/files/gcl-2.6.12-gcc5.patch
@@ -0,0 +1,8 @@
+diff -r -U1 gcl.orig/makefile gcl/makefile
+--- gcl.orig/makefile  2014-10-23 23:29:00.000000000 +0200
++++ gcl/makefile       2016-02-17 18:10:29.871808118 +0100
+@@ -267,3 +267,3 @@
+       $(AWK) 'BEGIN {print "#include \"include.h\"";print "#include 
\"cmponly.h\"";print "---"} {a=$$1;gsub("\\.\\.\\.","",a);print "\"#define " 
$$1 "\" " a}' $< |\
+-      $(CC) -E -I./$(HDIR) - |\
++      $(CC) -E -P -I./$(HDIR) - |\
+       $(AWK) '/^\-\-\-$$/ {i=1;next} {if (!i) next} {gsub("\"","");print}' >$@

diff --git a/dev-lisp/gcl/gcl-2.6.12.ebuild b/dev-lisp/gcl/gcl-2.6.12.ebuild
index 11e8275..959c269 100644
--- a/dev-lisp/gcl/gcl-2.6.12.ebuild
+++ b/dev-lisp/gcl/gcl-2.6.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -38,6 +38,7 @@ src_prepare() {
        chmod a+x add-defs add-defs1 config.guess config.sub configure 
install.sh
        chmod a+x bin/info bin/info1 gcl-tk/gcltksrv.in gcl-tk/ngcltksrv 
mp/gcclab
        chmod a+x o/egrep-def utils/replace xbin/*
+       epatch "${FILESDIR}"/${P}-gcc5.patch
 
        # fedora patches
        epatch "${WORKDIR}"/fedora/fd-leak.patch
@@ -62,6 +63,7 @@ src_prepare() {
 src_configure() {
        strip-flags
        filter-flags -fstack-protector -fstack-protector-all
+       append-cflags $(test-flags-CC -fgnu89-inline)
 
        local tcl=""
        if use tk; then