summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2010-08-01 20:02:03 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2010-08-01 20:02:03 +0000
commit0a48438f9b3ddb7bbe271ad7bbf9bb1277f31839 (patch)
tree057b1a2726f2caef0350df7b417f5a46d4e14c47 /app-text
parentadd media-sound/alsa-utils to dependencies, thanks to phajdan.jr for spotting... (diff)
downloadgentoo-2-0a48438f9b3ddb7bbe271ad7bbf9bb1277f31839.tar.gz
gentoo-2-0a48438f9b3ddb7bbe271ad7bbf9bb1277f31839.tar.bz2
gentoo-2-0a48438f9b3ddb7bbe271ad7bbf9bb1277f31839.zip
Respect LDFLAGS wrt bug 287555
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'app-text')
-rw-r--r--app-text/linuxdoc-tools/ChangeLog7
-rw-r--r--app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.21-ldflags.patch19
-rw-r--r--app-text/linuxdoc-tools/linuxdoc-tools-0.9.21_p11.ebuild7
3 files changed, 29 insertions, 4 deletions
diff --git a/app-text/linuxdoc-tools/ChangeLog b/app-text/linuxdoc-tools/ChangeLog
index e048bef408b6..e51565b52134 100644
--- a/app-text/linuxdoc-tools/ChangeLog
+++ b/app-text/linuxdoc-tools/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-text/linuxdoc-tools
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/linuxdoc-tools/ChangeLog,v 1.16 2010/01/25 18:53:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/linuxdoc-tools/ChangeLog,v 1.17 2010/08/01 20:02:03 xarthisius Exp $
+
+ 01 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org>
+ linuxdoc-tools-0.9.21_p11.ebuild,
+ +files/linuxdoc-tools-0.9.21-ldflags.patch:
+ Respect LDFLAGS wrt bug 287555
25 Jan 2010; Raúl Porcel <armin76@gentoo.org>
linuxdoc-tools-0.9.21_p11.ebuild:
diff --git a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.21-ldflags.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.21-ldflags.patch
new file mode 100644
index 000000000000..24643929df2f
--- /dev/null
+++ b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.21-ldflags.patch
@@ -0,0 +1,19 @@
+Respect FLAGS
+
+http://bugs.gentoo.org/show_bug.cgi?id=287555
+
+--- rtf-fix/Makefile
++++ rtf-fix/Makefile
+@@ -1,11 +1,9 @@
+-CC=gcc
+ LEX=flex
+-CFLAGS=-O
+
+ all: rtf2rtf
+
+ rtf2rtf: rtf2rtf.c
+- $(CC) $(CFLAGS) -o rtf2rtf rtf2rtf.c -lfl
++ $(CC) $(LDFLAGS) $(CFLAGS) -o rtf2rtf rtf2rtf.c -lfl
+
+ rtf2rtf.c: rtf2rtf.l
+ $(LEX) -t rtf2rtf.l>rtf2rtf.c
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.21_p11.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.21_p11.ebuild
index 8b70210199bd..07e743fcc911 100644
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.21_p11.ebuild
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.21_p11.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/linuxdoc-tools/linuxdoc-tools-0.9.21_p11.ebuild,v 1.7 2010/01/25 18:53:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/linuxdoc-tools/linuxdoc-tools-0.9.21_p11.ebuild,v 1.8 2010/08/01 20:02:03 xarthisius Exp $
-inherit eutils sgml-catalog
+inherit eutils sgml-catalog toolchain-funcs
MY_PV=${PV/_p/-0.}
@@ -38,12 +38,13 @@ src_unpack() {
epatch "${FILESDIR}/${PN}-0.9.13-letter.patch"
epatch "${FILESDIR}/${PN}-0.9.20-lib64.patch"
epatch "${FILESDIR}/${PN}-0.9.21-malloc.patch"
+ epatch "${FILESDIR}/${PN}-0.9.21-ldflags.patch"
}
src_compile() {
local myconf="--with-installed-iso-entities"
econf $myconf || die "./configure failed"
- emake CFLAGS="${CFLAGS}" || die "Compilation failed"
+ emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" || die "Compilation failed"
}
src_install() {