Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/readline/, sys-libs/readline/files/
Date: Wed, 09 Jun 2021 22:07:38
Message-Id: 1623276426.be86ca1b22fb91e2ccc6e82719342b38d8ac2afe.vapier@gentoo
1 commit: be86ca1b22fb91e2ccc6e82719342b38d8ac2afe
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 9 22:06:54 2021 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 9 22:07:06 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be86ca1b
7
8 sys-libs/readline: add upstream fix for Windows cross-compiling
9
10 Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
11
12 .../files/readline-8.1-windows-signals.patch | 23 ++++++++++++++++++++++
13 sys-libs/readline/readline-8.1_p1.ebuild | 1 +
14 2 files changed, 24 insertions(+)
15
16 diff --git a/sys-libs/readline/files/readline-8.1-windows-signals.patch b/sys-libs/readline/files/readline-8.1-windows-signals.patch
17 new file mode 100644
18 index 00000000000..2f818fc7f9c
19 --- /dev/null
20 +++ b/sys-libs/readline/files/readline-8.1-windows-signals.patch
21 @@ -0,0 +1,23 @@
22 +fix from upstream
23 +
24 +commit 4be5608573b2be2e31f3d2a01446e22e1c9d7839
25 +Author: Chet Ramey <chet.ramey@××××.edu>
26 +Date: Wed Jan 27 11:49:50 2021 -0500
27 +
28 + commit bash-20210122 snapshot
29 +
30 +diff --git a/lib/readline/signals.c b/lib/readline/signals.c
31 +index 0943c643b27d..ecaf699e9261 100644
32 +--- a/signals.c
33 ++++ b/signals.c
34 +@@ -266,8 +266,10 @@ _rl_handle_signal (int sig)
35 + case SIGQUIT:
36 + #endif
37 +
38 ++#if defined (HAVE_POSIX_SIGNALS)
39 + if (block_sig)
40 + sigprocmask (SIG_BLOCK, &set, &oset);
41 ++#endif
42 +
43 + rl_echo_signal_char (sig);
44 + rl_cleanup_after_signal ();
45
46 diff --git a/sys-libs/readline/readline-8.1_p1.ebuild b/sys-libs/readline/readline-8.1_p1.ebuild
47 index 944bdc74689..5cd7a3bdc21 100644
48 --- a/sys-libs/readline/readline-8.1_p1.ebuild
49 +++ b/sys-libs/readline/readline-8.1_p1.ebuild
50 @@ -59,6 +59,7 @@ PATCHES=(
51 "${FILESDIR}"/${PN}-7.0-headers.patch
52 "${FILESDIR}"/${PN}-8.0-headers.patch
53 "${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch
54 + "${FILESDIR}"/${PN}-8.1-windows-signals.patch
55 )
56
57 # Needed because we don't want the patches being unpacked