summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2010-08-06 13:57:10 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2010-08-06 13:57:10 +0000
commitbb0f67b16409058e782541bad8a63e83e7378a0d (patch)
tree7a41ad2e967903d92c48bad73ba72be80d74bd86 /net-dns/sheerdns
parentVersion bump. (diff)
downloadgentoo-2-bb0f67b16409058e782541bad8a63e83e7378a0d.tar.gz
gentoo-2-bb0f67b16409058e782541bad8a63e83e7378a0d.tar.bz2
gentoo-2-bb0f67b16409058e782541bad8a63e83e7378a0d.zip
Respect LDFLAGS + multilib support. Bug #309123. THanks to Doktor Notor <notordoktor@gmail.com> for the patch
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-dns/sheerdns')
-rw-r--r--net-dns/sheerdns/ChangeLog9
-rw-r--r--net-dns/sheerdns/files/sheerdns-1.0.1-makefile.patch4
-rw-r--r--net-dns/sheerdns/sheerdns-1.0.1-r1.ebuild (renamed from net-dns/sheerdns/sheerdns-1.0.1.ebuild)10
3 files changed, 16 insertions, 7 deletions
diff --git a/net-dns/sheerdns/ChangeLog b/net-dns/sheerdns/ChangeLog
index 77755aa3a3a4..55f2a6b2a2c6 100644
--- a/net-dns/sheerdns/ChangeLog
+++ b/net-dns/sheerdns/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-dns/sheerdns
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/sheerdns/ChangeLog,v 1.7 2010/01/22 16:03:02 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/sheerdns/ChangeLog,v 1.8 2010/08/06 13:57:09 hwoarang Exp $
+
+*sheerdns-1.0.1-r1 (06 Aug 2010)
+
+ 06 Aug 2010; Markos Chandras <hwoarang@gentoo.org> -sheerdns-1.0.1.ebuild,
+ +sheerdns-1.0.1-r1.ebuild, files/sheerdns-1.0.1-makefile.patch:
+ Respect LDFLAGS + multilib support. Bug #309123. THanks to Doktor Notor
+ <notordoktor@gmail.com> for the patch
22 Jan 2010; Dawid Węgliński <cla@gentoo.org> sheerdns-1.0.1.ebuild,
+files/sheerdns-1.0.1-makefile.patch:
diff --git a/net-dns/sheerdns/files/sheerdns-1.0.1-makefile.patch b/net-dns/sheerdns/files/sheerdns-1.0.1-makefile.patch
index 468bcd8f681d..eabf7235a75e 100644
--- a/net-dns/sheerdns/files/sheerdns-1.0.1-makefile.patch
+++ b/net-dns/sheerdns/files/sheerdns-1.0.1-makefile.patch
@@ -13,11 +13,11 @@ diff -Naur sheerdns.old/Makefile sheerdns/Makefile
sheerdns: $(OBJECTS)
- gcc -o sheerdns $(OBJECTS)
-+ $(CC) -o sheerdns $(OBJECTS)
++ $(CC) -o sheerdns $(OBJECTS) $(LDFLAGS)
sheerdnshash: hash.c
- gcc $(CFLAGS) -o sheerdnshash hash.c -DSTANDALONE -Wall
-+ $(CC) $(CFLAGS) -o sheerdnshash hash.c -DSTANDALONE -Wall
++ $(CC) $(CFLAGS) -o sheerdnshash hash.c -DSTANDALONE -Wall $(LDFLAGS)
.c.o: $(SRCS)
- gcc $(CFLAGS) -c $<
diff --git a/net-dns/sheerdns/sheerdns-1.0.1.ebuild b/net-dns/sheerdns/sheerdns-1.0.1-r1.ebuild
index fab0a43eed00..b358e72be8d1 100644
--- a/net-dns/sheerdns/sheerdns-1.0.1.ebuild
+++ b/net-dns/sheerdns/sheerdns-1.0.1-r1.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/sheerdns/sheerdns-1.0.1.ebuild,v 1.6 2010/01/22 16:03:55 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/sheerdns/sheerdns-1.0.1-r1.ebuild,v 1.1 2010/08/06 13:57:09 hwoarang Exp $
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs multilib
DESCRIPTION="Sheerdns is a small, simple, fast master only DNS server"
HOMEPAGE="http://threading.2038bug.com/sheerdns/"
SRC_URI="http://threading.2038bug.com/sheerdns/${P}.tar.gz
- http://dev.gentoo.org/~iggy/${P}-${PR}.patch"
+ http://dev.gentoo.org/~iggy/${P}-r0.patch"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
@@ -18,9 +18,11 @@ S="${WORKDIR}/${PN}"
src_unpack() {
unpack ${A}
- epatch "${DISTDIR}"/${P}-${PR}.patch || die "failed to apply patch"
+ epatch "${DISTDIR}"/${P}-r0.patch || die "failed to apply patch"
cd "${S}"
epatch "${FILESDIR}"/${P}-makefile.patch
+ # Fix multilib support
+ sed -i "/^CFLAGS/s:usr/lib:usr/$(get_libdir):" Makefile
}
src_compile() {