* [gentoo-commits] proj/musl:master commit in: net-libs/libnsl/, net-libs/libnsl/files/
@ 2017-09-16 23:50 Aric Belsito
0 siblings, 0 replies; 3+ messages in thread
From: Aric Belsito @ 2017-09-16 23:50 UTC (permalink / raw
To: gentoo-commits
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 @@
+ * <kukuk@suse.de>
+ */
+
+-
+ #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
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/musl:master commit in: net-libs/libnsl/, net-libs/libnsl/files/
@ 2017-09-16 23:59 Aric Belsito
0 siblings, 0 replies; 3+ messages in thread
From: Aric Belsito @ 2017-09-16 23:59 UTC (permalink / raw
To: gentoo-commits
commit: 9f51db391d92e8318158a75a38163dc3d563a47d
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Sat Sep 16 23:58:18 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Sat Sep 16 23:58:18 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=9f51db39
net-libs/libnsl: fix implicit __stpcpy
net-libs/libnsl/Manifest | 2 +-
net-libs/libnsl/files/libnsl-1.1.0-musl.patch | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/net-libs/libnsl/Manifest b/net-libs/libnsl/Manifest
index 70aec19..e607397 100644
--- a/net-libs/libnsl/Manifest
+++ b/net-libs/libnsl/Manifest
@@ -1,4 +1,4 @@
-AUX libnsl-1.1.0-musl.patch 980 SHA256 ddc11241b1b9de8de4fb210f34857f74790e87210a683b5a16d820d6bf546a0d SHA512 1b8cd54615f2311ca25deeab2d99e79f267de1adfde03bde876e21650a9690b8ed391aae1e94f5a103b5b8c8d3244e458faa72039eec72ba087e3485e00f8e2c WHIRLPOOL 9c59e75878fe3ef0a87f510984d770de4d01d5bc785f17e5bff8b1781877284604153e1796705cd924c1ce3107fcf11820a14ea16c4d0bd4bc51712ada26bf91
+AUX libnsl-1.1.0-musl.patch 1032 SHA256 c00dacc15d8b6673e2f74816cd8642ab0cde4045530a9ce7223e6cbb7695ee67 SHA512 7e0a0b0fd75790650655eed4821ade68c97c951fc15285a9fa75239b63240cd6721a75a63de1ebb9faf63fbf1d79ca7a856b30e145bc56842333de3fba11bd31 WHIRLPOOL 7699da3feab31cd876aae204788edb65129dfbe072a8ac9871008f7efe909e0c723dcba4361b24d2d40737a385283eb1b33b6bc34588ffa4b4b7500e93d73da0
DIST libnsl-1.1.0.tar.gz 209148 SHA256 a23cfcf7f29f168b95e821d01217600096c05be8cd5c085450cb4f160425277b SHA512 12555ed701d06247b6774c6c2759ada280ffce73820976adb4aaa48b50b97121b1805412541778dfcdd8845af6a10b2e5a9dc0eb7b953e84467d0a40ad3360cd WHIRLPOOL c347bbd72b75d1e3ab0069f802da8e4e4e4931a8a61b4abed1dd664c4576e7e22e96c012858c684ec79a981aea84460eae3a2ccb8e94aa7bfecfdd99c3e54730
EBUILD libnsl-1.1.0.ebuild 1010 SHA256 fbe5a6dd770ef832336607f11a40026c06ae254aababb84fc853ab549e81a179 SHA512 84d1332f2906df6c12f7096f6f63a12d4165d98e30f0ef0c08d7be9747cce98836726b3c261f13f79fbc7e1879cded86d0b320835fc8092c991b668e02b05eb2 WHIRLPOOL a5bbb974f2f9704f7484ee5261e65ce8739184ce8c9542b90d1a0980d78cace5f14fc76ae2ed73b8e1b6ccf6de5972b7666ed7a419be210e5265f88e9c4ed7bb
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
index 6d59d2b..7b73c49 100644
--- a/net-libs/libnsl/files/libnsl-1.1.0-musl.patch
+++ b/net-libs/libnsl/files/libnsl-1.1.0-musl.patch
@@ -1,7 +1,7 @@
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 @@
+@@ -56,10 +56,42 @@
* <kukuk@suse.de>
*/
@@ -21,6 +21,10 @@ diff -Naur libnsl-libnsl-1.1.0.orig/src/rpcsvc/nis.h libnsl-libnsl-1.1.0/src/rpc
+#define __mempcpy mempcpy
+#endif
+
++#ifdef __stpcpy
++#define __stpcpy stpcpy
++#endif
++
+#ifndef __strtok_r
+#define __strtok_r strtok_r
+#endif
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/musl:master commit in: net-libs/libnsl/, net-libs/libnsl/files/
@ 2018-12-30 1:26 Anthony G. Basile
0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2018-12-30 1:26 UTC (permalink / raw
To: gentoo-commits
commit: ac6a398029190edbeb2662fcf867d0ed7e015c0f
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 30 01:26:30 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Dec 30 01:26:30 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=ac6a3980
net-libs/libnsl: in tree version works
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
net-libs/libnsl/Manifest | 1 -
net-libs/libnsl/files/libnsl-1.1.0-musl.patch | 47 ------------------------
net-libs/libnsl/libnsl-1.1.0-r3.ebuild | 52 ---------------------------
net-libs/libnsl/metadata.xml | 12 -------
4 files changed, 112 deletions(-)
diff --git a/net-libs/libnsl/Manifest b/net-libs/libnsl/Manifest
deleted file mode 100644
index 399abba..0000000
--- a/net-libs/libnsl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libnsl-1.1.0.tar.gz 209148 SHA256 a23cfcf7f29f168b95e821d01217600096c05be8cd5c085450cb4f160425277b SHA512 12555ed701d06247b6774c6c2759ada280ffce73820976adb4aaa48b50b97121b1805412541778dfcdd8845af6a10b2e5a9dc0eb7b953e84467d0a40ad3360cd WHIRLPOOL c347bbd72b75d1e3ab0069f802da8e4e4e4931a8a61b4abed1dd664c4576e7e22e96c012858c684ec79a981aea84460eae3a2ccb8e94aa7bfecfdd99c3e54730
diff --git a/net-libs/libnsl/files/libnsl-1.1.0-musl.patch b/net-libs/libnsl/files/libnsl-1.1.0-musl.patch
deleted file mode 100644
index 7b73c49..0000000
--- a/net-libs/libnsl/files/libnsl-1.1.0-musl.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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,42 @@
- * <kukuk@suse.de>
- */
-
--
- #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
-+
-+#ifdef __stpcpy
-+#define __stpcpy stpcpy
-+#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-r3.ebuild b/net-libs/libnsl/libnsl-1.1.0-r3.ebuild
deleted file mode 100644
index 85388a1..0000000
--- a/net-libs/libnsl/libnsl-1.1.0-r3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Public client interface for NIS(YP) and NIS+ in a IPv6 ready version"
-HOMEPAGE="https://github.com/thkukuk/libnsl"
-SRC_URI="https://github.com/thkukuk/${PN}/archive/${P}.tar.gz"
-
-SLOT="0/2"
-LICENSE="LGPL-2.1+"
-
-# Stabilize together with glibc-2.26!
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~sh ~sparc ~x86"
-
-IUSE=""
-
-DEPEND="
- net-libs/libtirpc[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}
- !<sys-libs/glibc-2.26
-"
-
-PATCHES=( "${FILESDIR}"/${P}-musl.patch )
-
-S=${WORKDIR}/${PN}-${P}
-
-src_prepare(){
- default
- find "${S}" -name '*.h' -exec \
- sed -e 's|^__BEGIN_DECLS$|#ifdef __cplusplus\nextern "C" {\n#endif|' \
- -e 's|^__END_DECLS$|#ifdef __cplusplus\n}\n#endif|' \
- -e 's| __THROW||' \
- -i {} \; || die
- eautoreconf
-}
-
-multilib_src_configure() {
- local myconf=(
- --enable-shared
- --disable-static
- )
- ECONF_SOURCE=${S} econf "${myconf[@]}"
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libnsl/metadata.xml b/net-libs/libnsl/metadata.xml
deleted file mode 100644
index bcf493e..0000000
--- a/net-libs/libnsl/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>toolchain@gentoo.org</email>
- <name>Gentoo Toolchain Project</name>
-</maintainer>
-<maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System Project</name>
-</maintainer>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-12-30 1:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-16 23:59 [gentoo-commits] proj/musl:master commit in: net-libs/libnsl/, net-libs/libnsl/files/ Aric Belsito
-- strict thread matches above, loose matches on Subject: below --
2018-12-30 1:26 Anthony G. Basile
2017-09-16 23:50 Aric Belsito
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox