summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2021-06-09 18:06:54 -0400
committerMike Frysinger <vapier@gentoo.org>2021-06-09 18:07:06 -0400
commitbe86ca1b22fb91e2ccc6e82719342b38d8ac2afe (patch)
tree760180b2ba99722950e833bbeddc6b1c79a21561 /sys-libs/readline
parentdev-ml/ppx_tools: require < OCaml 4.12 for older ppx_tools (diff)
downloadgentoo-be86ca1b22fb91e2ccc6e82719342b38d8ac2afe.tar.gz
gentoo-be86ca1b22fb91e2ccc6e82719342b38d8ac2afe.tar.bz2
gentoo-be86ca1b22fb91e2ccc6e82719342b38d8ac2afe.zip
sys-libs/readline: add upstream fix for Windows cross-compiling
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'sys-libs/readline')
-rw-r--r--sys-libs/readline/files/readline-8.1-windows-signals.patch23
-rw-r--r--sys-libs/readline/readline-8.1_p1.ebuild1
2 files changed, 24 insertions, 0 deletions
diff --git a/sys-libs/readline/files/readline-8.1-windows-signals.patch b/sys-libs/readline/files/readline-8.1-windows-signals.patch
new file mode 100644
index 000000000000..2f818fc7f9c1
--- /dev/null
+++ b/sys-libs/readline/files/readline-8.1-windows-signals.patch
@@ -0,0 +1,23 @@
+fix from upstream
+
+commit 4be5608573b2be2e31f3d2a01446e22e1c9d7839
+Author: Chet Ramey <chet.ramey@case.edu>
+Date: Wed Jan 27 11:49:50 2021 -0500
+
+ commit bash-20210122 snapshot
+
+diff --git a/lib/readline/signals.c b/lib/readline/signals.c
+index 0943c643b27d..ecaf699e9261 100644
+--- a/signals.c
++++ b/signals.c
+@@ -266,8 +266,10 @@ _rl_handle_signal (int sig)
+ case SIGQUIT:
+ #endif
+
++#if defined (HAVE_POSIX_SIGNALS)
+ if (block_sig)
+ sigprocmask (SIG_BLOCK, &set, &oset);
++#endif
+
+ rl_echo_signal_char (sig);
+ rl_cleanup_after_signal ();
diff --git a/sys-libs/readline/readline-8.1_p1.ebuild b/sys-libs/readline/readline-8.1_p1.ebuild
index 944bdc746894..5cd7a3bdc211 100644
--- a/sys-libs/readline/readline-8.1_p1.ebuild
+++ b/sys-libs/readline/readline-8.1_p1.ebuild
@@ -59,6 +59,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.0-headers.patch
"${FILESDIR}"/${PN}-8.0-headers.patch
"${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch
+ "${FILESDIR}"/${PN}-8.1-windows-signals.patch
)
# Needed because we don't want the patches being unpacked