summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Kursawe <phosphan@gentoo.org>2010-08-26 20:17:47 +0000
committerPatrick Kursawe <phosphan@gentoo.org>2010-08-26 20:17:47 +0000
commit1fb8aa297bd917748ab09cac1cfc3234b374d7a0 (patch)
tree904e6d4f401098ba09d0ae73f58458f4cb148d73 /dev-util/cdecl
parentPatch from Dane Smith <smithdanea@gmail.com> which fixes LDFLAGS (bug #334461... (diff)
downloadgentoo-2-1fb8aa297bd917748ab09cac1cfc3234b374d7a0.tar.gz
gentoo-2-1fb8aa297bd917748ab09cac1cfc3234b374d7a0.tar.bz2
gentoo-2-1fb8aa297bd917748ab09cac1cfc3234b374d7a0.zip
Respects LDFLAGS now.
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'dev-util/cdecl')
-rw-r--r--dev-util/cdecl/ChangeLog8
-rw-r--r--dev-util/cdecl/cdecl-2.5-r1.ebuild6
-rw-r--r--dev-util/cdecl/files/cdecl-2.5.patch37
3 files changed, 32 insertions, 19 deletions
diff --git a/dev-util/cdecl/ChangeLog b/dev-util/cdecl/ChangeLog
index c2898fe9313b..88bc87cc1fcf 100644
--- a/dev-util/cdecl/ChangeLog
+++ b/dev-util/cdecl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/cdecl
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdecl/ChangeLog,v 1.15 2009/07/07 18:40:43 phosphan Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdecl/ChangeLog,v 1.16 2010/08/26 20:17:47 phosphan Exp $
+
+ 26 Aug 2010; Patrick Kursawe <phosphan@gentoo.org> cdecl-2.5-r1.ebuild,
+ files/cdecl-2.5.patch:
+ Respects LDFLAGS now.
07 Jul 2009; Patrick Kursawe <phosphan@gentoo.org> files/cdecl-2.5.patch:
Fixing build with glibc-2.10, see bug #276068.
diff --git a/dev-util/cdecl/cdecl-2.5-r1.ebuild b/dev-util/cdecl/cdecl-2.5-r1.ebuild
index 487585138088..49495751624a 100644
--- a/dev-util/cdecl/cdecl-2.5-r1.ebuild
+++ b/dev-util/cdecl/cdecl-2.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdecl/cdecl-2.5-r1.ebuild,v 1.14 2009/01/11 20:56:36 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdecl/cdecl-2.5-r1.ebuild,v 1.15 2010/08/26 20:17:47 phosphan Exp $
inherit eutils toolchain-funcs
@@ -37,7 +37,7 @@ src_compile() {
CFLAGS="${CFLAGS} -DUSE_READLINE"
LIBS="${LIBS} -lreadline -lncurses"
fi
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LIBS="${LIBS}" || die
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" || die
}
src_install() {
diff --git a/dev-util/cdecl/files/cdecl-2.5.patch b/dev-util/cdecl/files/cdecl-2.5.patch
index f6fad3948720..ed04d59abc74 100644
--- a/dev-util/cdecl/files/cdecl-2.5.patch
+++ b/dev-util/cdecl/files/cdecl-2.5.patch
@@ -1,17 +1,3 @@
---- Makefile
-+++ Makefile.new
-@@ -15,9 +15,9 @@
- #
- # add -DUSE_READLINE To compile in support for the GNU readline library.
-
--CFLAGS= -s -O2 -DUSE_READLINE
-+
- CC= gcc
--LIBS= -lreadline -ltermcap
-+
- ALLFILES= makefile cdgram.y cdlex.l cdecl.c cdecl.1 testset testset++
- BINDIR= /usr/bin
- MANDIR= /usr/man/man1
--- cdecl.c
+++ cdecl.c.new
@@ -67,6 +67,7 @@
@@ -60,3 +46,26 @@
if (!strcmp(line, "quit") || !strcmp(line, "exit")) {
free(line);
return ret;
+--- Makefile.old 2010-08-26 22:06:28.000000000 +0200
++++ Makefile 2010-08-26 22:11:42.000000000 +0200
+@@ -15,9 +15,9 @@
+ #
+ # add -DUSE_READLINE To compile in support for the GNU readline library.
+
+-CFLAGS= -s -O2 -DUSE_READLINE
++
+ CC= gcc
+-LIBS= -lreadline -ltermcap
++
+ ALLFILES= makefile cdgram.y cdlex.l cdecl.c cdecl.1 testset testset++
+ BINDIR= /usr/bin
+ MANDIR= /usr/man/man1
+@@ -29,7 +29,7 @@
+ ln c++decl cdecl
+
+ c++decl: cdgram.c cdlex.c cdecl.c
+- $(CC) $(CFLAGS) -o c++decl cdecl.c $(LIBS)
++ $(CC) $(CFLAGS) ${LDFLAGS} -o c++decl cdecl.c $(LIBS)
+ rm -f cdecl
+
+ cdlex.c: cdlex.l