summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Krier <cedk@gentoo.org>2007-12-07 16:54:41 +0000
committerCédric Krier <cedk@gentoo.org>2007-12-07 16:54:41 +0000
commit59295194a1e675c62f01b92547e60049a144d1ce (patch)
tree4ba52b522f1cc7eefcd67ac3fedf2bad98b7b394 /net-misc
parentppc stable, bug #201289 (diff)
downloadgentoo-2-59295194a1e675c62f01b92547e60049a144d1ce.tar.gz
gentoo-2-59295194a1e675c62f01b92547e60049a144d1ce.tar.bz2
gentoo-2-59295194a1e675c62f01b92547e60049a144d1ce.zip
Fix for bug #201568
(Portage version: 2.1.3.19)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/olsrd/ChangeLog6
-rw-r--r--net-misc/olsrd/files/olsrd-0.5.4-build_fix.patch13
-rw-r--r--net-misc/olsrd/olsrd-0.5.4.ebuild10
3 files changed, 26 insertions, 3 deletions
diff --git a/net-misc/olsrd/ChangeLog b/net-misc/olsrd/ChangeLog
index 91e4377b92ed..56ca34dacfda 100644
--- a/net-misc/olsrd/ChangeLog
+++ b/net-misc/olsrd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/olsrd
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/ChangeLog,v 1.12 2007/10/21 12:00:10 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/ChangeLog,v 1.13 2007/12/07 16:54:40 cedk Exp $
+
+ 07 Dec 2007; Cédric Krier <cedk@gentoo.org>
+ +files/olsrd-0.5.4-build_fix.patch, olsrd-0.5.4.ebuild:
+ Fix for bug #201568
*olsrd-0.5.4 (21 Oct 2007)
diff --git a/net-misc/olsrd/files/olsrd-0.5.4-build_fix.patch b/net-misc/olsrd/files/olsrd-0.5.4-build_fix.patch
new file mode 100644
index 000000000000..ae229a8b3e4d
--- /dev/null
+++ b/net-misc/olsrd/files/olsrd-0.5.4-build_fix.patch
@@ -0,0 +1,13 @@
+Index: olsrd-0.5.4/Makefile
+===================================================================
+--- olsrd-0.5.4.orig/Makefile 2007-11-03 11:33:37.075400513 +0100
++++ olsrd-0.5.4/Makefile 2007-11-03 11:33:47.171975883 +0100
+@@ -71,8 +71,6 @@
+ $(CFGOBJS):
+ $(MAKECMD) -C $(CFGDIR)
+
+-# generate it always
+-.PHONY: src/builddata.c
+ src/builddata.c:
+ @$(RM) "$@"
+ @echo "#include \"defs.h\"" >> "$@"
diff --git a/net-misc/olsrd/olsrd-0.5.4.ebuild b/net-misc/olsrd/olsrd-0.5.4.ebuild
index 0422992874db..0b77ae1b84f0 100644
--- a/net-misc/olsrd/olsrd-0.5.4.ebuild
+++ b/net-misc/olsrd/olsrd-0.5.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/olsrd-0.5.4.ebuild,v 1.1 2007/10/21 12:00:10 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/olsrd/olsrd-0.5.4.ebuild,v 1.2 2007/12/07 16:54:40 cedk Exp $
inherit eutils toolchain-funcs
@@ -15,8 +15,14 @@ IUSE="gtk"
DEPEND="gtk? ( =x11-libs/gtk+-2* )"
-src_compile() {
+src_unpack() {
+ unpack ${A}
cd "${S}"
+
+ epatch "${FILESDIR}/${P}-build_fix.patch"
+}
+
+src_compile() {
emake OS=linux CC="$(tc-getCC)" build_all || die "emake failed"
if use gtk ; then