summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2014-06-20 19:27:34 +0000
committerFabian Groffen <grobian@gentoo.org>2014-06-20 19:27:34 +0000
commit7f0fddad1562de4da95c551b5c736fb26d71df67 (patch)
treeabb02a90e7e8c049260b5982d0174d0a8df2779f /net-dns
parentVersion bump. (diff)
downloadgentoo-2-7f0fddad1562de4da95c551b5c736fb26d71df67.tar.gz
gentoo-2-7f0fddad1562de4da95c551b5c736fb26d71df67.tar.bz2
gentoo-2-7f0fddad1562de4da95c551b5c736fb26d71df67.zip
Fix for Prefix, based on patch by Matthias Maier, bug #501172, force for syntax errors in older ebuilds
(Portage version: 2.2.10.1-prefix/cvs/Darwin i386, RepoMan options: --force, signed Manifest commit with key 0x5F75F607C5C74E89)
Diffstat (limited to 'net-dns')
-rw-r--r--net-dns/unbound/ChangeLog5
-rw-r--r--net-dns/unbound/unbound-1.4.22.ebuild8
2 files changed, 9 insertions, 4 deletions
diff --git a/net-dns/unbound/ChangeLog b/net-dns/unbound/ChangeLog
index bc0cc033de2e..4d33eee74c2b 100644
--- a/net-dns/unbound/ChangeLog
+++ b/net-dns/unbound/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-dns/unbound
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/ChangeLog,v 1.69 2014/06/19 08:46:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/ChangeLog,v 1.70 2014/06/20 19:27:34 grobian Exp $
+
+ 20 Jun 2014; Fabian Groffen <grobian@gentoo.org> unbound-1.4.22.ebuild:
+ Fix for Prefix, based on patch by Matthias Maier, bug #501172
19 Jun 2014; Michał Górny <mgorny@gentoo.org> unbound-1.4.21-r2.ebuild,
unbound-1.4.22.ebuild:
diff --git a/net-dns/unbound/unbound-1.4.22.ebuild b/net-dns/unbound/unbound-1.4.22.ebuild
index 3ce4c7c7eea1..3606fe5af5b9 100644
--- a/net-dns/unbound/unbound-1.4.22.ebuild
+++ b/net-dns/unbound/unbound-1.4.22.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/unbound-1.4.22.ebuild,v 1.2 2014/06/19 08:46:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/unbound-1.4.22.ebuild,v 1.3 2014/06/20 19:27:34 grobian Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -60,7 +60,7 @@ src_prepare() {
}
src_configure() {
- append-ldflags -Wl,-z,noexecstack
+ [[ ${CHOST} == *-darwin* ]] || append-ldflags -Wl,-z,noexecstack
multilib-minimal_src_configure
}
@@ -77,7 +77,9 @@ multilib_src_configure() {
--with-ldns="${EPREFIX}"/usr \
--with-libevent="${EPREFIX}"/usr \
--with-pidfile="${EPREFIX}"/var/run/unbound.pid \
- --with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt
+ --with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \
+ --with-ssl="${EPREFIX}"/usr \
+ --with-libexpat="${EPREFIX}"/usr
# http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
# $(use_enable debug lock-checks) \