1 |
commit: 94497c9737e91347b528b31d5c4a60e649b8a45e |
2 |
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Jan 15 06:33:52 2019 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 19 03:21:45 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94497c97 |
7 |
|
8 |
dev-libs/ivykis: fix building with glibc-2.28 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/675338 |
11 |
Package-Manager: Portage-2.3.55, Repoman-2.3.12 |
12 |
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com> |
13 |
Closes: https://github.com/gentoo/gentoo/pull/10836 |
14 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
15 |
|
16 |
.../files/ivykis-fix-segfault-glibc-2.28.patch | 29 ++++++++++++++++++++++ |
17 |
dev-libs/ivykis/ivykis-0.42.3-r1.ebuild | 12 +++++++++ |
18 |
2 files changed, 41 insertions(+) |
19 |
|
20 |
diff --git a/dev-libs/ivykis/files/ivykis-fix-segfault-glibc-2.28.patch b/dev-libs/ivykis/files/ivykis-fix-segfault-glibc-2.28.patch |
21 |
new file mode 100644 |
22 |
index 00000000000..5d7352669f2 |
23 |
--- /dev/null |
24 |
+++ b/dev-libs/ivykis/files/ivykis-fix-segfault-glibc-2.28.patch |
25 |
@@ -0,0 +1,29 @@ |
26 |
+# https://github.com/buytenh/ivykis/issues/15 |
27 |
+# https://github.com/buytenh/ivykis/pull/16 |
28 |
+ |
29 |
+diff --git a/configure.ac b/configure.ac |
30 |
+index e9b10c0..56440d1 100644 |
31 |
+--- a/configure.ac |
32 |
++++ b/configure.ac |
33 |
+@@ -88,6 +88,8 @@ esac |
34 |
+ # link in libpthread_nonshared.a if it is available. |
35 |
+ # |
36 |
+ AC_CHECK_LIB([pthread_nonshared], [pthread_atfork]) |
37 |
++# the lib is gone in glibc 2.28, things are now in c_nonshared |
38 |
++AC_CHECK_LIB([c_nonshared], [pthread_atfork]) |
39 |
+ |
40 |
+ # Checks for header files. |
41 |
+ AC_CHECK_HEADERS([process.h]) |
42 |
+diff --git a/src/pthr.h b/src/pthr.h |
43 |
+index a41eaf3..32c1af2 100644 |
44 |
+--- a/src/pthr.h |
45 |
++++ b/src/pthr.h |
46 |
+@@ -42,7 +42,7 @@ static inline int pthreads_available(void) |
47 |
+ * symbol because that causes it to be undefined even if you link |
48 |
+ * libpthread_nonshared.a in explicitly. |
49 |
+ */ |
50 |
+-#ifndef HAVE_LIBPTHREAD_NONSHARED |
51 |
++#if !defined(HAVE_LIBPTHREAD_NONSHARED) && !defined(HAVE_LIBC_NONSHARED) |
52 |
+ #pragma weak pthread_atfork |
53 |
+ #endif |
54 |
+ |
55 |
|
56 |
diff --git a/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild b/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild |
57 |
index bb7cc9b108c..7682426f6e8 100644 |
58 |
--- a/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild |
59 |
+++ b/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild |
60 |
@@ -3,6 +3,8 @@ |
61 |
|
62 |
EAPI=6 |
63 |
|
64 |
+inherit autotools |
65 |
+ |
66 |
DESCRIPTION="Library for asynchronous I/O readiness notification" |
67 |
HOMEPAGE="https://github.com/buytenh/ivykis" |
68 |
SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
69 |
@@ -12,6 +14,16 @@ SLOT="0" |
70 |
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86" |
71 |
IUSE="static-libs" |
72 |
|
73 |
+PATCHES=( |
74 |
+ "${FILESDIR}/${PN}-fix-segfault-glibc-2.28.patch" # Bug 675338 |
75 |
+) |
76 |
+ |
77 |
+src_prepare() { |
78 |
+ default |
79 |
+ |
80 |
+ eautoreconf |
81 |
+} |
82 |
+ |
83 |
src_configure() { |
84 |
econf $(use_enable static-libs static) |
85 |
} |