Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/iputils/
Date: Wed, 01 Jun 2016 04:06:42
Message-Id: 1464753962.cf759e3b000d92683cc0c200cebaea448aadb484.vapier@gentoo
1 commit: cf759e3b000d92683cc0c200cebaea448aadb484
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 1 04:06:02 2016 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 1 04:06:02 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf759e3b
7
8 net-misc/iputils: make -lresolv linkage dynamic #584132
9
10 net-misc/iputils/iputils-20151218.ebuild | 9 +++++++++
11 net-misc/iputils/iputils-99999999.ebuild | 9 +++++++++
12 2 files changed, 18 insertions(+)
13
14 diff --git a/net-misc/iputils/iputils-20151218.ebuild b/net-misc/iputils/iputils-20151218.ebuild
15 index 1f283fa..03be077 100644
16 --- a/net-misc/iputils/iputils-20151218.ebuild
17 +++ b/net-misc/iputils/iputils-20151218.ebuild
18 @@ -82,6 +82,14 @@ src_configure() {
19 use ipv6 || IPV6_TARGETS=()
20 }
21
22 +ldflag_resolv() {
23 + # See if the system includes a libresolv. #584132
24 + echo "main(){}" > "${T}"/resolv.c
25 + if ${CC} ${CFLAGS} ${LDFLAGS} "${T}"/resolv.c -lresolv -o "${T}"/resolv 2>/dev/null ; then
26 + echo -lresolv
27 + fi
28 +}
29 +
30 src_compile() {
31 tc-export CC
32 emake \
33 @@ -89,6 +97,7 @@ src_compile() {
34 USE_IDN=$(usex idn) \
35 USE_GCRYPT=$(usex gcrypt) \
36 USE_CRYPTO=$(usex ssl) \
37 + LDFLAG_RESOLV=$(ldflag_resolv) \
38 IPV4_TARGETS="${IPV4_TARGETS[*]}" \
39 IPV6_TARGETS="${IPV6_TARGETS[*]}"
40
41
42 diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
43 index 09b9ad1..8276b43 100644
44 --- a/net-misc/iputils/iputils-99999999.ebuild
45 +++ b/net-misc/iputils/iputils-99999999.ebuild
46 @@ -82,6 +82,14 @@ src_configure() {
47 use ipv6 || IPV6_TARGETS=()
48 }
49
50 +ldflag_resolv() {
51 + # See if the system includes a libresolv. #584132
52 + echo "main(){}" > "${T}"/resolv.c
53 + if ${CC} ${CFLAGS} ${LDFLAGS} "${T}"/resolv.c -lresolv -o "${T}"/resolv 2>/dev/null ; then
54 + echo -lresolv
55 + fi
56 +}
57 +
58 src_compile() {
59 tc-export CC
60 emake \
61 @@ -89,6 +97,7 @@ src_compile() {
62 USE_IDN=$(usex idn) \
63 USE_GCRYPT=$(usex gcrypt) \
64 USE_CRYPTO=$(usex ssl) \
65 + LDFLAG_RESOLV=$(ldflag_resolv) \
66 IPV4_TARGETS="${IPV4_TARGETS[*]}" \
67 IPV6_TARGETS="${IPV6_TARGETS[*]}"