Gentoo Archives: gentoo-commits

From: Aric Belsito <lluixhi@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: dev-libs/libbsd/files/, dev-libs/libbsd/
Date: Tue, 30 Jan 2018 21:42:34
Message-Id: 1517348473.a8cfa5cc19b6f475e4fd2a3b4484eb9d7fc78994.lluixhi@gentoo
1 commit: a8cfa5cc19b6f475e4fd2a3b4484eb9d7fc78994
2 Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
3 AuthorDate: Tue Jan 30 21:41:13 2018 +0000
4 Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
5 CommitDate: Tue Jan 30 21:41:13 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=a8cfa5cc
7
8 dev-libs/libbsd: add patch
9
10 there's definitely a way to do this that doesn't break glibc
11 compatibility
12
13 dev-libs/libbsd/files/libbsd-0.8.7-musl.patch | 26 ++++++++++++++++++++++++++
14 dev-libs/libbsd/libbsd-0.8.7.ebuild | 1 +
15 2 files changed, 27 insertions(+)
16
17 diff --git a/dev-libs/libbsd/files/libbsd-0.8.7-musl.patch b/dev-libs/libbsd/files/libbsd-0.8.7-musl.patch
18 new file mode 100644
19 index 0000000..b541ff4
20 --- /dev/null
21 +++ b/dev-libs/libbsd/files/libbsd-0.8.7-musl.patch
22 @@ -0,0 +1,26 @@
23 +diff -Naur libbsd-0.8.7.orig/include/bsd/stdlib.h libbsd-0.8.7/include/bsd/stdlib.h
24 +--- libbsd-0.8.7.orig/include/bsd/stdlib.h 2018-01-30 13:28:46.240353330 -0800
25 ++++ libbsd-0.8.7/include/bsd/stdlib.h 2018-01-30 13:39:33.539341738 -0800
26 +@@ -67,9 +67,7 @@
27 + const unsigned char *table, unsigned endbyte);
28 +
29 + void *reallocf(void *ptr, size_t size);
30 +-#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26)
31 + void *reallocarray(void *ptr, size_t nmemb, size_t size);
32 +-#endif
33 +
34 + long long strtonum(const char *nptr, long long minval, long long maxval,
35 + const char **errstr);
36 +diff -Naur libbsd-0.8.7.orig/include/bsd/string.h libbsd-0.8.7/include/bsd/string.h
37 +--- libbsd-0.8.7.orig/include/bsd/string.h 2018-01-30 13:28:46.239353330 -0800
38 ++++ libbsd-0.8.7/include/bsd/string.h 2018-01-30 13:39:27.108341853 -0800
39 +@@ -42,9 +42,7 @@
40 + char *strnstr(const char *str, const char *find, size_t str_len);
41 + void strmode(mode_t mode, char *str);
42 +
43 +-#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25)
44 + void explicit_bzero(void *buf, size_t len);
45 +-#endif
46 + __END_DECLS
47 +
48 + #endif
49
50 diff --git a/dev-libs/libbsd/libbsd-0.8.7.ebuild b/dev-libs/libbsd/libbsd-0.8.7.ebuild
51 index 338666f..938d433 100644
52 --- a/dev-libs/libbsd/libbsd-0.8.7.ebuild
53 +++ b/dev-libs/libbsd/libbsd-0.8.7.ebuild
54 @@ -18,6 +18,7 @@ RDEPEND=""
55
56 src_prepare() {
57 eapply "${FILESDIR}"/${PN}-0.8.5-cdef-headers.patch
58 + eapply "${FILESDIR}"/${PN}-0.8.7-musl.patch
59 default
60 }