commit: a1e9ffcd17aa852b1b73ed26bad7ed9555c7fde2 Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> AuthorDate: Sat Sep 16 23:50:02 2017 +0000 Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> CommitDate: Sat Sep 16 23:50:02 2017 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=a1e9ffcd
net-libs/libnsl: add patch More complicated musl issues than was initially apparent adapted from alpine linux net-libs/libnsl/Manifest | 3 +- net-libs/libnsl/files/libnsl-1.1.0-musl.patch | 43 +++++++++++++++++++++++++++ net-libs/libnsl/libnsl-1.1.0.ebuild | 3 +- 3 files changed, 47 insertions(+), 2 deletions(-) diff --git a/net-libs/libnsl/Manifest b/net-libs/libnsl/Manifest index 6e4241c..7dc270b 100644 --- a/net-libs/libnsl/Manifest +++ b/net-libs/libnsl/Manifest @@ -1,3 +1,4 @@ +AUX libnsl-1.1.0-musl.patch 980 SHA256 ddc11241b1b9de8de4fb210f34857f74790e87210a683b5a16d820d6bf546a0d SHA512 1b8cd54615f2311ca25deeab2d99e79f267de1adfde03bde876e21650a9690b8ed391aae1e94f5a103b5b8c8d3244e458faa72039eec72ba087e3485e00f8e2c WHIRLPOOL 9c59e75878fe3ef0a87f510984d770de4d01d5bc785f17e5bff8b1781877284604153e1796705cd924c1ce3107fcf11820a14ea16c4d0bd4bc51712ada26bf91 DIST libnsl-1.1.0.tar.gz 209148 SHA256 a23cfcf7f29f168b95e821d01217600096c05be8cd5c085450cb4f160425277b SHA512 12555ed701d06247b6774c6c2759ada280ffce73820976adb4aaa48b50b97121b1805412541778dfcdd8845af6a10b2e5a9dc0eb7b953e84467d0a40ad3360cd WHIRLPOOL c347bbd72b75d1e3ab0069f802da8e4e4e4931a8a61b4abed1dd664c4576e7e22e96c012858c684ec79a981aea84460eae3a2ccb8e94aa7bfecfdd99c3e54730 -EBUILD libnsl-1.1.0.ebuild 1006 SHA256 dae9457daf893d82cbaab00ee2bc72bd2a2e17477558d29120e905068e4c1183 SHA512 98459d3710f1cc93f3e70c40b89b0a65c9827831826d18790e9ef22235f18af2b057a90f495c0777e9e734496bed4c5a986fa3cad1cee27fe6eb3407638b26aa WHIRLPOOL dff95f9c0317e9e20abd3a703e571bba6c2004cebb2cc46f56d0c9880d9eb5475ee92ef0d04099da490af85997afcc203b80c8d2a146175f0adde5188ae83f36 +EBUILD libnsl-1.1.0.ebuild 1003 SHA256 edfa8d22d21794348c00856f1cc54127c221fb7b384b365bba4959cd2c318687 SHA512 60ebe318184aa6900a8ada9f7c5c3def4bfbe5dcb76e7eaa39b140b869b6285a9ff22795641d08499a829cccd17c21d3611f3e60df859bfd47d303a95c7d4998 WHIRLPOOL 343ae7a7f4314bc907b7ad3c26eb1d010ecdf239b612c1b3d44e9597c064a7b1999eb68e7366723383139a76c5f1ba3629c89e903dbce784746c225bd2c3b528 MISC metadata.xml 379 SHA256 ebf32af5bc074fc17a37c93745bc34847424be60d6d5d23a69d88baabc554bcf SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753 WHIRLPOOL eab5963365c94d28e5e60cc0b4eaee3d576bf8cc3372eb739f0fcbdbf4f3c37fc1af7c90b39866e476fdcd2d529b7e78f2bbcc1d3b938c047702d09db3141fa6 diff --git a/net-libs/libnsl/files/libnsl-1.1.0-musl.patch b/net-libs/libnsl/files/libnsl-1.1.0-musl.patch new file mode 100644 index 0000000..6d59d2b --- /dev/null +++ b/net-libs/libnsl/files/libnsl-1.1.0-musl.patch @@ -0,0 +1,43 @@ +diff -Naur libnsl-libnsl-1.1.0.orig/src/rpcsvc/nis.h libnsl-libnsl-1.1.0/src/rpcsvc/nis.h +--- libnsl-libnsl-1.1.0.orig/src/rpcsvc/nis.h 2017-08-18 12:40:34.000000000 -0700 ++++ libnsl-libnsl-1.1.0/src/rpcsvc/nis.h 2017-09-16 16:48:58.148882799 -0700 +@@ -56,10 +56,38 @@ + * <[email protected]> + */ + +- + #ifndef __nis_object_h + #define __nis_object_h + ++#ifndef rawmemchr ++#define rawmemchr(s, c) memchr((s),(size_t)-1,(c)) ++#endif ++ ++#ifndef __asprintf ++#define __asprintf asprintf ++#endif ++ ++#ifndef __mempcpy ++#define __mempcpy mempcpy ++#endif ++ ++#ifndef __strtok_r ++#define __strtok_r strtok_r ++#endif ++ ++#ifndef __always_inline ++#define __always_inline inline ++#endif ++ ++#ifndef TEMP_FAILURE_RETRY ++#define TEMP_FAILURE_RETRY(exp) ({ \ ++ typeof (exp) _rc; \ ++ do { \ ++ _rc = (exp); \ ++ } while (_rc == -1 && errno == EINTR); \ ++ _rc; }) ++#endif ++ + #define NIS_MAXSTRINGLEN 255 + #define NIS_MAXNAMELEN 1024 + #define NIS_MAXATTRNAME 32 diff --git a/net-libs/libnsl/libnsl-1.1.0.ebuild b/net-libs/libnsl/libnsl-1.1.0.ebuild index 3fbbc6b..8683f9a 100644 --- a/net-libs/libnsl/libnsl-1.1.0.ebuild +++ b/net-libs/libnsl/libnsl-1.1.0.ebuild @@ -20,6 +20,8 @@ DEPEND=" " RDEPEND=${DEPEND} +PATCHES=( "${S}"/${P}-musl.patch ) + S=${WORKDIR}/${PN}-${P} src_prepare(){ @@ -28,7 +30,6 @@ src_prepare(){ sed -e 's|^__BEGIN_DECLS$|#ifdef __cplusplus\nextern "C" {\n#endif|' \ -e 's|^__END_DECLS$|#ifdef __cplusplus\n}\n#endif|' \ -e 's| __THROW||' \ - -e 's|__always_inline|inline|' \ -i {} \; || die eautoreconf }
