Gentoo Archives: gentoo-commits

From: Andrey Grozin <grozin@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lisp/gcl/, dev-lisp/gcl/files/
Date: Wed, 17 Feb 2016 17:39:53
Message-Id: 1455730192.537acbec9ddd8856a4c226b5c032e3bafcf3da31.grozin@gentoo
1 commit: 537acbec9ddd8856a4c226b5c032e3bafcf3da31
2 Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 17 17:29:52 2016 +0000
4 Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 17 17:29:52 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=537acbec
7
8 dev-lisp/gcl: 2.6.12 now uilds with gcc-5
9
10 Bug: 574652
11
12 Package-Manager: portage-2.2.27
13
14 dev-lisp/gcl/files/gcl-2.6.12-gcc5.patch | 8 ++++++++
15 dev-lisp/gcl/gcl-2.6.12.ebuild | 4 +++-
16 2 files changed, 11 insertions(+), 1 deletion(-)
17
18 diff --git a/dev-lisp/gcl/files/gcl-2.6.12-gcc5.patch b/dev-lisp/gcl/files/gcl-2.6.12-gcc5.patch
19 new file mode 100644
20 index 0000000..07d3892
21 --- /dev/null
22 +++ b/dev-lisp/gcl/files/gcl-2.6.12-gcc5.patch
23 @@ -0,0 +1,8 @@
24 +diff -r -U1 gcl.orig/makefile gcl/makefile
25 +--- gcl.orig/makefile 2014-10-23 23:29:00.000000000 +0200
26 ++++ gcl/makefile 2016-02-17 18:10:29.871808118 +0100
27 +@@ -267,3 +267,3 @@
28 + $(AWK) 'BEGIN {print "#include \"include.h\"";print "#include \"cmponly.h\"";print "---"} {a=$$1;gsub("\\.\\.\\.","",a);print "\"#define " $$1 "\" " a}' $< |\
29 +- $(CC) -E -I./$(HDIR) - |\
30 ++ $(CC) -E -P -I./$(HDIR) - |\
31 + $(AWK) '/^\-\-\-$$/ {i=1;next} {if (!i) next} {gsub("\"","");print}' >$@
32
33 diff --git a/dev-lisp/gcl/gcl-2.6.12.ebuild b/dev-lisp/gcl/gcl-2.6.12.ebuild
34 index 11e8275..959c269 100644
35 --- a/dev-lisp/gcl/gcl-2.6.12.ebuild
36 +++ b/dev-lisp/gcl/gcl-2.6.12.ebuild
37 @@ -1,4 +1,4 @@
38 -# Copyright 1999-2014 Gentoo Foundation
39 +# Copyright 1999-2016 Gentoo Foundation
40 # Distributed under the terms of the GNU General Public License v2
41 # $Id$
42
43 @@ -38,6 +38,7 @@ src_prepare() {
44 chmod a+x add-defs add-defs1 config.guess config.sub configure install.sh
45 chmod a+x bin/info bin/info1 gcl-tk/gcltksrv.in gcl-tk/ngcltksrv mp/gcclab
46 chmod a+x o/egrep-def utils/replace xbin/*
47 + epatch "${FILESDIR}"/${P}-gcc5.patch
48
49 # fedora patches
50 epatch "${WORKDIR}"/fedora/fd-leak.patch
51 @@ -62,6 +63,7 @@ src_prepare() {
52 src_configure() {
53 strip-flags
54 filter-flags -fstack-protector -fstack-protector-all
55 + append-cflags $(test-flags-CC -fgnu89-inline)
56
57 local tcl=""
58 if use tk; then