commit: bd3c89b549253cc5b1ac0675b07ef6cef4d330eb
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Mon Apr 3 01:35:06 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Mon Apr 3 01:35:06 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=bd3c89b5
net-libs/libtirpc: depend on sys-libs/queue
net-libs/libtirpc/Manifest | 5 +--
.../libtirpc/files/0006-fix_queue_h_include.patch | 44 ----------------------
net-libs/libtirpc/libtirpc-0.2.5.ebuild | 2 +-
net-libs/libtirpc/libtirpc-1.0.1.ebuild | 2 +-
4 files changed, 4 insertions(+), 49 deletions(-)
diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index 6a9ecd0..f48dcc0 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -3,13 +3,12 @@ AUX 0002-Misc-header-fixes.patch 1074 SHA256
519dd9015db2505404118e0067c7cbfec22
AUX 0003-fix_cdefs_h_include.patch 15313 SHA256
c5bae800d887a08eba89d817b6cc19c4337b14e53f2ce8e9fb7e9984dbfe4168 SHA512
cf686acda95f8ccca486b518ee2ada42a443b3cc524bf4374b770612f501e0f2a75c61c8586a9d490ce3ee1e373559cf72c380d9fa99a75d0037b74e35fa3647
WHIRLPOOL
12915a1d45649695198c20bd609681f640bdbf3a1b40554d051e6a07534b7889a4676990edab90605571f0bc2caaebae074f3c6ec9ef88304c597acd0580b7a8
AUX 0004-fix_DECLS.patch 29124 SHA256
bdc844c56cfe2d5b060d59fee009576895504e2df492423ddaedd9915c785650 SHA512
8d0efe87a0e8444dd10d4b63430dfd038a7591a0a1e54bc539a4023c7421a89caae1c811d6a2ed4e33fd4d0beebd48c11fc28b5de41dbedf0c1e0fbeb8885cf3
WHIRLPOOL
5ec477f9dfb79a53b2689dea6e158c42437f0c15e18f0eebd3aede63e59b1191974fd913b26db352feb84d468dd7770e102510022ae2b017aa634f0e9e335a27
AUX 0005-fix_remaining_issues.patch 373 SHA256
db061da4e22c4ed9192587a622454e69c6999b5ccfdafa5588957440051277e2 SHA512
db70a64424904a669534e25c70b13dffb0ddd3437e81f6fee69ac2399e00bdd4e83ee9c65bc0bb789e28c1ac8e030a22461642e699fd371a4f147782a5845912
WHIRLPOOL
06e9f643c66867ddf965427e5c874eaa3c4275b961634d3fc669120275e3db8613a9bd997d612976c078584e016234f34e5a4abfeef20eb655997c7825e8cb56
-AUX 0006-fix_queue_h_include.patch 1788 SHA256
3b8f296eb375052210874ebc3caeadd0cdf689a27e279761e16d76b411e89f8f SHA512
f5a419d883dc6fc0bc6ebb02c3b1f7ce95aeb2b261eb5a49498b600844a27041b32f146fd8bba3d1769c32a67a15b9e40d9ffe3598d9448ebfc4fde6446e69aa
WHIRLPOOL
1e7b71255a11abd45dc88b74d8d8146f60c0a621ebe42f437e45e01f791a0ca020c27f841091f556d33fd284336b2e8cc8fa91fa9ca9ed5dd5904c1a5fe82212
AUX 0007-no-des.patch 960 SHA256
12823f030b803045108df782018d04ca253d4439b0e92015ddb140dcd33c1be3 SHA512
95ad086657d008a01a4072ba7141391cbbe8ac35372b2f063a3f9774eb5dfa12b97bcff0c1b6da2d887001beaa60a8524823df93a8de2fdb73ad2a30340770ba
WHIRLPOOL
bd075834fddeff5ae86b90273f5c7b820f88649045e65b63d09dc26c35ada0fd1162dcf8aeb1cd82ad59b9092eceb92e154fa58c9beca540dc31ead7cc96b72e
AUX git.patch 24736 SHA256
0a62de190d38660efff0ddbb73b5b6315fdc015c20cf9c235e35c0cf7eeb0e85 SHA512
4dd540470e9a25b5df0ea2c883dd647f26b71ed82e880c7efa4eed51dd98b898e18964a3ee998ceeadf39caed0a661f110f72157ec70584e33131d0a0f375a00
WHIRLPOOL
3b7fe2207ea84b56ce889778c4ef31669afe7dd340270063c1ac09accc3459e4d53bd5d084bfa090ec041fb188cd8bac6aad55d7fd60f43e485c89d53e06b14e
AUX libtirpc-0.2.5-stdarg.patch 667 SHA256
2b31b1148af9d96c9a9e6f609c0b5b03424954d6251c18d64b6119afd8afa6f7 SHA512
2197f8c2ed3b4dbfc54ee37e973a6e275d19c6dde5d066b9ce45beecdbb17c9e620d7c6f0997b7ebfeb2bd1741327028a793b34edd94d59a89c8b36ac102b025
WHIRLPOOL
90d4e88c18f0d93ab8dfef4981377c2a6df42ff90b70049d07e203e7b66a5087910fe501cf9e1b93782eb25a8b3a8680c03287ccc563b838f517e5d1524b12c5
DIST libtirpc-0.2.5.tar.bz2 459094 SHA256
62f9de7c2c8686c568757730e1fef66502a0e00d6cacf33546d0267984e002db SHA512
9f8afa1acb04a2c2c558018f2528f8caaa79994a2af2abeed947f914145872ef72988b241e11925c799db0de9ec51fd9baecd2b08150240b22f91e2e55a45194
WHIRLPOOL
a2b4f1c4825f2b774c2290cccd9d552bb7566ec9eb5988d3ab619d7870a907600f67e7af39fbc3e245606db8534f114c990145789c383206d3a9cf96cf043d8c
DIST libtirpc-1.0.1.tar.bz2 495125 SHA256
5156974f31be7ccbc8ab1de37c4739af6d9d42c87b1d5caf4835dda75fcbb89e SHA512
c9b449e737bc2bd3d56e31e8352f312e89a7ec2a11b73b5ac314e7d82d3b644c611e422b623912453b67b668f86a6de7bb7f18c9495dd15de8e2798ec2ff41c8
WHIRLPOOL
cce6a4e69bd634b40d66594a81c23d2044b63eec16d6c96d6fcfaa7f2ca41fb9af99c8e2b964ec12be82682afa4090b218d7e14399fdfc9b32df6c2234bc3c9e
DIST libtirpc-glibc-nfs.tar.xz 8948 SHA256
2677cfedf626f3f5a8f6e507aed5bb8f79a7453b589d684dbbc086e755170d83 SHA512
90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba
WHIRLPOOL
06bcf3fd4e424a86071e5c4ddeb89aa571c862e765aae9382d9f9a55ab72cd1c623490555c1a9bd3380a2d04ecb10fb47a75a7dddf449d4368a1a01617226858
-EBUILD libtirpc-0.2.5.ebuild 1920 SHA256
787410d5dfb2794a29c607fd47db15230d42050eabd9ddc57efe86486e31c64b SHA512
b9fbd63c6356a0d3e5f3a7d3b40727baa5039175d664cb14f49601c845d70767bd2bbd848b50541275e645cf7eb64b4ddab98475c0cf327d41992f92cd588b88
WHIRLPOOL
523e39ae954a6477a84382df171cab339e4be5b5dcb8db21150691b0b0cff13484e69d45256c7a15947a09d7f1b7fab9a37b58a8a22857fe3c53115e091af596
-EBUILD libtirpc-1.0.1.ebuild 1459 SHA256
07111cf5c1d83335cf63924f1941b0688cc29cc80ea52a6dcb06f7c9cbffaf4b SHA512
8f0d4bab27059aa93762cfcecf288cc6e8dd4551c29d8f486f227a4e64d4f689e81a8ff0e993708d4af79c028f10c1761210cf23f171e0d0b6864305abf486bf
WHIRLPOOL
1d0b4c9b6ad4f3efec3955bb9cd43cd87dda29ddce8bae28e1398a462e0dedc33932045a607253c2a583554c74dc203943d09e9876475071660386f63ae2d432
+EBUILD libtirpc-0.2.5.ebuild 1899 SHA256
3623a04c9092a9a6dd668d70ac741ee55aeeab2c6d757e2c053bc78b833f3e97 SHA512
f25fe58b1d5aaa510350199d4ad7dc5d2956aaa35989a25da88215e9a9d446819b7e6ca788fef989892130cd1ee4baae68d87d6d6d7fd59596e4c6d484d53aa1
WHIRLPOOL
4da3882bee772b029e95fe3bc6c94f7e9cd30ff47cfd8e6537494e74e9423d4d8fd9e7248f1c019042812fe75d086ae4fb24f3531b146b0b8dd91ad547c7d295
+EBUILD libtirpc-1.0.1.ebuild 1438 SHA256
0f072addbde3ed907efd658759cb39cf61769760ef13f9d08cb4e24e0a12422f SHA512
b98ac6adaf451cad9e9bb5376ccf44e6386d9b2949786258c11871315a18fb8f0c03b1473e00c78f44e8b671c0825807dde98d0b643f5dcbca6ee6c1127731bd
WHIRLPOOL
74b7d1382ae2fc5f90e17e43e5b99954402b856b28f209973b0a5c76ea99d4eeafcc5b06e210745f56e6ebbbc3b606af0ffcd7d522d110b28e88d8ad8bc88f25
MISC metadata.xml 335 SHA256
02e9487e791e2d6aa99e74025dd90a6c54d86c73d530c96316e93f7552e1439a SHA512
d6dd857293827907e545dc6e8631d06682d20e13442f8ce6cbd2e2a789d885c8a788f4ed1d062a8c54c4165d22eb096279d4c2f598e462a57faaf8bec1e9777b
WHIRLPOOL
6a802fc6b1fdd5bc815c4d2d41de0cba5cff351cdd1fa80021c02233b3facf21674d94ec7b822c2d514e5e1c721cf3ae2b88c885afdce8a7b60d2e63da71183c
diff --git a/net-libs/libtirpc/files/0006-fix_queue_h_include.patch
b/net-libs/libtirpc/files/0006-fix_queue_h_include.patch
deleted file mode 100644
index 9db410c..0000000
--- a/net-libs/libtirpc/files/0006-fix_queue_h_include.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- src/clnt_bcast.c.orig 2014-11-28 09:31:22.462289976 +0000
-+++ src/clnt_bcast.c 2014-11-28 09:34:06.588289976 +0000
-@@ -43,8 +43,41 @@
- */
- #include <sys/socket.h>
- #include <sys/types.h>
-+#ifdef __GLIBC__
- #include <sys/queue.h>
-+#else
-+/*
-+ * * Tail queue definitions.
-+ * */
-+#define _TAILQ_HEAD(name, type, qual) \
-+struct name { \
-+ qual type *tqh_first; /* first element */ \
-+ qual type *qual *tqh_last; /* addr of last next element */ \
-+}
-+#define TAILQ_HEAD(name, type) _TAILQ_HEAD(name, struct type,)
-
-+#define _TAILQ_ENTRY(type, qual) \
-+struct { \
-+ qual type *tqe_next; /* next element */ \
-+ qual type *qual *tqe_prev; /* address of previous next element */\
-+}
-+#define TAILQ_ENTRY(type) _TAILQ_ENTRY(struct type,)
-+/*
-+ * * Tail queue functions.
-+ * */
-+#define TAILQ_INIT(head) do { \
-+ (head)->tqh_first = NULL; \
-+ (head)->tqh_last = &(head)->tqh_first; \
-+} while (/*CONSTCOND*/0)
-+
-+#define TAILQ_INSERT_TAIL(head, elm, field) do { \
-+ (elm)->field.tqe_next = NULL; \
-+ (elm)->field.tqe_prev = (head)->tqh_last; \
-+ *(head)->tqh_last = (elm); \
-+ (head)->tqh_last = &(elm)->field.tqe_next; \
-+} while (/*CONSTCOND*/0)
-+
-+#endif
- #include <net/if.h>
- #include <netinet/in.h>
- #include <ifaddrs.h>
diff --git a/net-libs/libtirpc/libtirpc-0.2.5.ebuild
b/net-libs/libtirpc/libtirpc-0.2.5.ebuild
index 2e825c4..fa28963 100644
--- a/net-libs/libtirpc/libtirpc-0.2.5.ebuild
+++ b/net-libs/libtirpc/libtirpc-0.2.5.ebuild
@@ -17,6 +17,7 @@ IUSE="ipv6 kerberos static-libs"
RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
+ elibc_musl? ( sys-libs/queue )
app-arch/xz-utils
>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
RDEPEND="${RDEPEND}
@@ -37,7 +38,6 @@ src_prepare() {
epatch "${FILESDIR}"/0003-fix_cdefs_h_include.patch
epatch "${FILESDIR}"/0004-fix_DECLS.patch
epatch "${FILESDIR}"/0005-fix_remaining_issues.patch
- epatch "${FILESDIR}"/0006-fix_queue_h_include.patch
epatch "${FILESDIR}"/0007-no-des.patch
eautoconf
eautoreconf
diff --git a/net-libs/libtirpc/libtirpc-1.0.1.ebuild
b/net-libs/libtirpc/libtirpc-1.0.1.ebuild
index 49e0966..d6c00b0 100644
--- a/net-libs/libtirpc/libtirpc-1.0.1.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.0.1.ebuild
@@ -17,6 +17,7 @@ IUSE="ipv6 kerberos static-libs"
RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
+ elibc_musl? ( sys-libs/queue )
app-arch/xz-utils
>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
@@ -28,7 +29,6 @@ src_unpack() {
src_prepare() {
default
# Musl fixes
- epatch "${FILESDIR}"/0006-fix_queue_h_include.patch
epatch "${FILESDIR}"/git.patch
}
