summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDawid Węgliński <cla@gentoo.org>2010-01-22 16:03:03 +0000
committerDawid Węgliński <cla@gentoo.org>2010-01-22 16:03:03 +0000
commitc6c7837113a709cdfac65702b43674ccc09d6028 (patch)
tree26b5848b80c89125f443b89dd21844b208cb8ffa /net-dns/sheerdns
parentMarked ~hppa (bug #295361). (diff)
downloadgentoo-2-c6c7837113a709cdfac65702b43674ccc09d6028.tar.gz
gentoo-2-c6c7837113a709cdfac65702b43674ccc09d6028.tar.bz2
gentoo-2-c6c7837113a709cdfac65702b43674ccc09d6028.zip
Respect user CFLAGS (bug #240888)
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'net-dns/sheerdns')
-rw-r--r--net-dns/sheerdns/ChangeLog8
-rw-r--r--net-dns/sheerdns/files/sheerdns-1.0.1-makefile.patch27
-rw-r--r--net-dns/sheerdns/sheerdns-1.0.1.ebuild10
3 files changed, 39 insertions, 6 deletions
diff --git a/net-dns/sheerdns/ChangeLog b/net-dns/sheerdns/ChangeLog
index df2d3afa21fa..77755aa3a3a4 100644
--- a/net-dns/sheerdns/ChangeLog
+++ b/net-dns/sheerdns/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-dns/sheerdns
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/sheerdns/ChangeLog,v 1.6 2007/12/01 23:57:14 angelos Exp $
+# 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 $
+
+ 22 Jan 2010; Dawid Węgliński <cla@gentoo.org> sheerdns-1.0.1.ebuild,
+ +files/sheerdns-1.0.1-makefile.patch:
+ Respect user CFLAGS (bug #240888)
01 Dec 2007; Christoph Mende <angelos@gentoo.org> sheerdns-1.0.1.ebuild:
Added ~amd64 wrt bug #189789
diff --git a/net-dns/sheerdns/files/sheerdns-1.0.1-makefile.patch b/net-dns/sheerdns/files/sheerdns-1.0.1-makefile.patch
new file mode 100644
index 000000000000..468bcd8f681d
--- /dev/null
+++ b/net-dns/sheerdns/files/sheerdns-1.0.1-makefile.patch
@@ -0,0 +1,27 @@
+diff -Naur sheerdns.old/Makefile sheerdns/Makefile
+--- sheerdns.old/Makefile 2010-01-22 16:15:33.000000000 +0100
++++ sheerdns/Makefile 2010-01-22 16:16:45.000000000 +0100
+@@ -1,5 +1,5 @@
+
+-CFLAGS = -Wall -g -O2 -pedantic -I/usr/lib
++CFLAGS += -I/usr/lib
+
+ SRCS=$(wildcard *.c)
+
+@@ -11,13 +11,13 @@
+ OBJECTS=$(SRCS:.c=.o)
+
+ sheerdns: $(OBJECTS)
+- gcc -o sheerdns $(OBJECTS)
++ $(CC) -o sheerdns $(OBJECTS)
+
+ sheerdnshash: hash.c
+- gcc $(CFLAGS) -o sheerdnshash hash.c -DSTANDALONE -Wall
++ $(CC) $(CFLAGS) -o sheerdnshash hash.c -DSTANDALONE -Wall
+
+ .c.o: $(SRCS)
+- gcc $(CFLAGS) -c $<
++ $(CC) $(CFLAGS) -c $<
+
+ clean:
+ rm -f sheerdns sheerdnshash *.o
diff --git a/net-dns/sheerdns/sheerdns-1.0.1.ebuild b/net-dns/sheerdns/sheerdns-1.0.1.ebuild
index 48bc9e570b94..808ca74a2b09 100644
--- a/net-dns/sheerdns/sheerdns-1.0.1.ebuild
+++ b/net-dns/sheerdns/sheerdns-1.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.4 2007/12/01 23:57:14 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/sheerdns/sheerdns-1.0.1.ebuild,v 1.5 2010/01/22 16:03:02 cla Exp $
-inherit eutils
+inherit eutils toolchain-funcs
DESCRIPTION="Sheerdns is a small, simple, fast master only DNS server"
HOMEPAGE="http://threading.2038bug.com/sheerdns/"
@@ -19,10 +19,12 @@ S="${WORKDIR}/${PN}"
src_unpack() {
unpack ${A}
epatch ${DISTDIR}/${P}-${PR}.patch || die "failed to apply patch"
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-makefile.patch
}
src_compile() {
- make || die
+ emake CC=$(tc-getCC) || die
}
src_install() {