1 |
commit: a6be33d66a7215a8f5f5ba63686090130b270151 |
2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 9 13:32:22 2017 +0000 |
4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 9 13:33:18 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6be33d6 |
7 |
|
8 |
dev-libs/libspt: fix build with >=sys-libs/glibc-2.26 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/630780 |
11 |
Package-Manager: Portage-2.3.13, Repoman-2.3.4 |
12 |
|
13 |
dev-libs/libspt/Manifest | 2 +- |
14 |
dev-libs/libspt/files/libspt-rpc.patch | 22 ++++++++++++++++++++++ |
15 |
dev-libs/libspt/libspt-1.1-r2.ebuild | 25 +++++++++++++++++++++++-- |
16 |
dev-libs/libspt/libspt-1.1-r3.ebuild | 25 +++++++++++++++++++++++-- |
17 |
dev-libs/libspt/metadata.xml | 11 +++++++---- |
18 |
5 files changed, 76 insertions(+), 9 deletions(-) |
19 |
|
20 |
diff --git a/dev-libs/libspt/Manifest b/dev-libs/libspt/Manifest |
21 |
index 77e4a20d9a4..ca801f97ad8 100644 |
22 |
--- a/dev-libs/libspt/Manifest |
23 |
+++ b/dev-libs/libspt/Manifest |
24 |
@@ -1 +1 @@ |
25 |
-DIST libspt-1.1.tar.bz2 165168 SHA256 fda34d08a8d167cdabd1d8645210b7ffc9e624e5accd37577f2bcb025830e22e SHA512 5b2ec289ce51f1f2040b68c559ef6e1ea1e59f50c3d639a93176fa8a5f3f75481651c4d0acd393eac8d2193f2aae19f882897323caf344cbfde52e32cc3a02b9 WHIRLPOOL ed05a7cbbdcd420d811a13dfc29b712a6bd241b41740029b4b366907085f98f13d14a4012ea53d862f4780a3f070f9ea7cbd70bf8bff30c8aec87a3a2d7c0e95 |
26 |
+DIST libspt-1.1.tar.bz2 165168 BLAKE2B a21778ba8b3c22d7fa655460ede0d04efc98635b1be74575cbb996b33bdb27ed75479ae6a2d7bc38c1052ac23547483e9d93c03531cbfe236e1e07944bad1673 SHA512 5b2ec289ce51f1f2040b68c559ef6e1ea1e59f50c3d639a93176fa8a5f3f75481651c4d0acd393eac8d2193f2aae19f882897323caf344cbfde52e32cc3a02b9 |
27 |
|
28 |
diff --git a/dev-libs/libspt/files/libspt-rpc.patch b/dev-libs/libspt/files/libspt-rpc.patch |
29 |
new file mode 100644 |
30 |
index 00000000000..79b545ace4f |
31 |
--- /dev/null |
32 |
+++ b/dev-libs/libspt/files/libspt-rpc.patch |
33 |
@@ -0,0 +1,22 @@ |
34 |
+--- a/configure.ac |
35 |
++++ b/configure.ac |
36 |
+@@ -55,7 +55,18 @@ |
37 |
+ AC_CHECK_FUNCS([dup2 ftruncate gettimeofday select strcspn strstr]dnl |
38 |
+ [ strchr memcpy bzero setutent setutxent updwtmp updwtmpx _openpty revoke getsid]dnl |
39 |
+ [ setsid setpgrp snprintf sigaction cfmakeraw]) |
40 |
++AC_ARG_WITH([libtirpc], |
41 |
++ [AS_HELP_STRING([--with-libtirpc],[Use libtirpc as RPC implementation (instead of sunrpc)])]) |
42 |
++AS_IF([test "x$with_libtirpc" = xyes], |
43 |
++ [PKG_CHECK_MODULES([TIRPC], |
44 |
++ [libtirpc], |
45 |
++ [CFLAGS="$CFLAGS $TIRPC_CFLAGS"; LIBS="$LIBS $TIRPC_LIBS";], |
46 |
++ [AC_MSG_ERROR([libtirpc requested, but library not found.])] |
47 |
++ )], |
48 |
++ [AC_CHECK_HEADER(rpc/rpc.h, |
49 |
++ [], |
50 |
++ [AC_MSG_ERROR([sunrpc requested, but headers are not present.])] |
51 |
++)]) |
52 |
+-AC_SEARCH_LIBS([xdr_free],[nsl rpclib]) |
53 |
+ AC_SEARCH_LIBS([socket],[socket]) |
54 |
+ AC_SEARCH_LIBS([nanosleep],[posix4]) |
55 |
+ |
56 |
|
57 |
diff --git a/dev-libs/libspt/libspt-1.1-r2.ebuild b/dev-libs/libspt/libspt-1.1-r2.ebuild |
58 |
index 55536d07fd3..cf5d08f80b2 100644 |
59 |
--- a/dev-libs/libspt/libspt-1.1-r2.ebuild |
60 |
+++ b/dev-libs/libspt/libspt-1.1-r2.ebuild |
61 |
@@ -3,6 +3,8 @@ |
62 |
|
63 |
EAPI="6" |
64 |
|
65 |
+inherit autotools |
66 |
+ |
67 |
DESCRIPTION="Library for handling root privilege" |
68 |
#HOMEPAGE="http://www.j10n.org/libspt/index.html" |
69 |
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" |
70 |
@@ -11,7 +13,26 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2" |
71 |
LICENSE="BSD-2" |
72 |
SLOT="0" |
73 |
KEYWORDS="alpha amd64 ppc x86" |
74 |
-IUSE="" |
75 |
+IUSE="+libtirpc" |
76 |
RESTRICT="test" |
77 |
|
78 |
-PATCHES=( "${FILESDIR}/${PN}-gentoo.patch" ) |
79 |
+RDEPEND="!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) |
80 |
+ libtirpc? ( net-libs/libtirpc )" |
81 |
+DEPEND="${RDEPEND} |
82 |
+ virtual/pkgconfig" |
83 |
+ |
84 |
+PATCHES=( |
85 |
+ "${FILESDIR}/${PN}-gentoo.patch" |
86 |
+ "${FILESDIR}/${PN}-rpc.patch" |
87 |
+) |
88 |
+ |
89 |
+src_prepare() { |
90 |
+ rm aclocal.m4 |
91 |
+ |
92 |
+ default |
93 |
+ eautoreconf |
94 |
+} |
95 |
+ |
96 |
+src_configure() { |
97 |
+ econf $(use_with libtirpc) |
98 |
+} |
99 |
|
100 |
diff --git a/dev-libs/libspt/libspt-1.1-r3.ebuild b/dev-libs/libspt/libspt-1.1-r3.ebuild |
101 |
index 028608c7a2d..d922b8c9919 100644 |
102 |
--- a/dev-libs/libspt/libspt-1.1-r3.ebuild |
103 |
+++ b/dev-libs/libspt/libspt-1.1-r3.ebuild |
104 |
@@ -3,6 +3,8 @@ |
105 |
|
106 |
EAPI="6" |
107 |
|
108 |
+inherit autotools |
109 |
+ |
110 |
DESCRIPTION="Library for handling root privilege" |
111 |
#HOMEPAGE="http://www.j10n.org/libspt/index.html" |
112 |
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" |
113 |
@@ -11,10 +13,29 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2" |
114 |
LICENSE="BSD-2" |
115 |
SLOT="0" |
116 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" |
117 |
-IUSE="suid" |
118 |
+IUSE="+libtirpc suid" |
119 |
RESTRICT="test" |
120 |
|
121 |
-PATCHES=( "${FILESDIR}/${PN}-gentoo.patch" ) |
122 |
+RDEPEND="!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) |
123 |
+ libtirpc? ( net-libs/libtirpc )" |
124 |
+DEPEND="${RDEPEND} |
125 |
+ virtual/pkgconfig" |
126 |
+ |
127 |
+PATCHES=( |
128 |
+ "${FILESDIR}/${PN}-gentoo.patch" |
129 |
+ "${FILESDIR}/${PN}-rpc.patch" |
130 |
+) |
131 |
+ |
132 |
+src_prepare() { |
133 |
+ rm aclocal.m4 |
134 |
+ |
135 |
+ default |
136 |
+ eautoreconf |
137 |
+} |
138 |
+ |
139 |
+src_configure() { |
140 |
+ econf $(use_with libtirpc) |
141 |
+} |
142 |
|
143 |
src_install() { |
144 |
default |
145 |
|
146 |
diff --git a/dev-libs/libspt/metadata.xml b/dev-libs/libspt/metadata.xml |
147 |
index c921b96adf6..4b6896b6c4a 100644 |
148 |
--- a/dev-libs/libspt/metadata.xml |
149 |
+++ b/dev-libs/libspt/metadata.xml |
150 |
@@ -1,8 +1,11 @@ |
151 |
<?xml version="1.0" encoding="UTF-8"?> |
152 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
153 |
<pkgmetadata> |
154 |
-<maintainer type="project"> |
155 |
- <email>cjk@g.o</email> |
156 |
- <name>Cjk</name> |
157 |
-</maintainer> |
158 |
+ <maintainer type="project"> |
159 |
+ <email>cjk@g.o</email> |
160 |
+ <name>Cjk</name> |
161 |
+ </maintainer> |
162 |
+ <use> |
163 |
+ <flag name="libtirpc">Build against net-libs/libtirpc for RPC support</flag> |
164 |
+ </use> |
165 |
</pkgmetadata> |