1 |
commit: b9f7df9e9c531dd6d7f29b315cd1af6a5a48d854 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 11 17:27:51 2020 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 11 17:36:08 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9f7df9e |
7 |
|
8 |
net-nds/rpcbind: fix detection of rpcsvc/mount.h |
9 |
|
10 |
Dropped ~riscv keyword due to sys-fs/quota. |
11 |
|
12 |
Closes: https://bugs.gentoo.org/665222 |
13 |
Package-Manager: Portage-2.3.84_p2, Repoman-2.3.20_p24 |
14 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
15 |
|
16 |
.../rpcbind/{rpcbind-9999.ebuild => rpcbind-1.2.5-r1.ebuild} | 10 ++++++++-- |
17 |
net-nds/rpcbind/rpcbind-9999.ebuild | 10 ++++++++-- |
18 |
2 files changed, 16 insertions(+), 4 deletions(-) |
19 |
|
20 |
diff --git a/net-nds/rpcbind/rpcbind-9999.ebuild b/net-nds/rpcbind/rpcbind-1.2.5-r1.ebuild |
21 |
similarity index 84% |
22 |
copy from net-nds/rpcbind/rpcbind-9999.ebuild |
23 |
copy to net-nds/rpcbind/rpcbind-1.2.5-r1.ebuild |
24 |
index 7e3bbeae8e8..59bcc41863e 100644 |
25 |
--- a/net-nds/rpcbind/rpcbind-9999.ebuild |
26 |
+++ b/net-nds/rpcbind/rpcbind-1.2.5-r1.ebuild |
27 |
@@ -1,9 +1,9 @@ |
28 |
-# Copyright 1999-2018 Gentoo Foundation |
29 |
+# Copyright 1999-2020 Gentoo Authors |
30 |
# Distributed under the terms of the GNU General Public License v2 |
31 |
|
32 |
EAPI=6 |
33 |
|
34 |
-inherit systemd |
35 |
+inherit flag-o-matic systemd |
36 |
|
37 |
if [[ ${PV} == "9999" ]] ; then |
38 |
EGIT_REPO_URI="git://linux-nfs.org/~steved/rpcbind.git" |
39 |
@@ -25,6 +25,7 @@ CDEPEND=">=net-libs/libtirpc-0.2.3:= |
40 |
systemd? ( sys-apps/systemd:= ) |
41 |
tcpd? ( sys-apps/tcp-wrappers )" |
42 |
DEPEND="${CDEPEND} |
43 |
+ sys-fs/quota[rpc] |
44 |
virtual/pkgconfig" |
45 |
RDEPEND="${CDEPEND} |
46 |
selinux? ( sec-policy/selinux-rpcbind )" |
47 |
@@ -45,6 +46,11 @@ src_configure() { |
48 |
$(use_enable warmstarts) |
49 |
$(use_enable tcpd libwrap) |
50 |
) |
51 |
+ |
52 |
+ # Allow configure to find /usr/include/rpc/rpc.h in rpcsvc/mount.h |
53 |
+ # https://bugs.gentoo.org/665222 |
54 |
+ append-cppflags "$($(tc-getPKG_CONFIG) --cflags libtirpc)" |
55 |
+ |
56 |
econf "${myeconfargs[@]}" |
57 |
} |
58 |
|
59 |
|
60 |
diff --git a/net-nds/rpcbind/rpcbind-9999.ebuild b/net-nds/rpcbind/rpcbind-9999.ebuild |
61 |
index 7e3bbeae8e8..59bcc41863e 100644 |
62 |
--- a/net-nds/rpcbind/rpcbind-9999.ebuild |
63 |
+++ b/net-nds/rpcbind/rpcbind-9999.ebuild |
64 |
@@ -1,9 +1,9 @@ |
65 |
-# Copyright 1999-2018 Gentoo Foundation |
66 |
+# Copyright 1999-2020 Gentoo Authors |
67 |
# Distributed under the terms of the GNU General Public License v2 |
68 |
|
69 |
EAPI=6 |
70 |
|
71 |
-inherit systemd |
72 |
+inherit flag-o-matic systemd |
73 |
|
74 |
if [[ ${PV} == "9999" ]] ; then |
75 |
EGIT_REPO_URI="git://linux-nfs.org/~steved/rpcbind.git" |
76 |
@@ -25,6 +25,7 @@ CDEPEND=">=net-libs/libtirpc-0.2.3:= |
77 |
systemd? ( sys-apps/systemd:= ) |
78 |
tcpd? ( sys-apps/tcp-wrappers )" |
79 |
DEPEND="${CDEPEND} |
80 |
+ sys-fs/quota[rpc] |
81 |
virtual/pkgconfig" |
82 |
RDEPEND="${CDEPEND} |
83 |
selinux? ( sec-policy/selinux-rpcbind )" |
84 |
@@ -45,6 +46,11 @@ src_configure() { |
85 |
$(use_enable warmstarts) |
86 |
$(use_enable tcpd libwrap) |
87 |
) |
88 |
+ |
89 |
+ # Allow configure to find /usr/include/rpc/rpc.h in rpcsvc/mount.h |
90 |
+ # https://bugs.gentoo.org/665222 |
91 |
+ append-cppflags "$($(tc-getPKG_CONFIG) --cflags libtirpc)" |
92 |
+ |
93 |
econf "${myeconfargs[@]}" |
94 |
} |