Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
[PATCH] configure: support split signal.h
- X-seq: zsh-workers 42618
- From: Benedikt Morbach <benedikt.morbach@xxxxxxxxxxxxxx>
- To: zsh-workers@xxxxxxx
- Subject: [PATCH] configure: support split signal.h
- Date: Tue, 10 Apr 2018 14:41:58 +0200
- Cc: Benedikt Morbach <benedikt.morbach@xxxxxxxxxxxxxx>
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=9I8EYNPCNlbOkoDYPjyKv5QVcaHHO7MTHdNi1V4Usdk=; b=JVfdr+1I5RPN4zIo/f9+V/G/03DRySQc370nogmlmCYWcW0E+r6UxXOqr2WSemtUMJ 342XRX1rit5KQwvNTxjHyPgvQZUxWm/Bd//rqAfTHv3UGCAe4godMDt1GqYhBgFicIky 4/fGftsV7+DaG0AJXL7odXNI039xAwzzbKPSMzHE1zoebjERfBgA+rGGDswHZ+6DjUYL zgJS5/70yEj2m/hWWBQ/NGQORtAJF6nR4e/guBds0IWjO3H8aoDnAW0ual37ibWFfsWK ZVPwSiwGNJhpITFr8lHIIJnWDTIca8zzxi6r/LHx93lFQhUe+37Le9gJ8bjJCxVqkkP1 Vpzw==
- List-help: <mailto:zsh-workers-help@zsh.org>
- List-id: Zsh Workers List <zsh-workers.zsh.org>
- List-post: <mailto:zsh-workers@zsh.org>
- List-unsubscribe: <mailto:zsh-workers-unsubscribe@zsh.org>
- Mailing-list: contact zsh-workers-help@xxxxxxx; run by ezmlm
Since glibc 2.25 signal.h is split into signum-generic.h and signum.h[1]
This adds support for gathering signal names from multiple files to configure.ac
(approach adapted from the ERRNO_H handling below)
Src/zsh.mdd and Src/signames{1,2}.awk work fine with this without modifications
[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=8082d91e1c449e0cb137468b731004a5e605c8c6
---
Please CC me on any replies as I'm not subscribed to the list
configure.ac | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 1a498f8b2..c0686b674 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1540,17 +1540,20 @@ if test -z "$sigfile_list"; then
/usr/include/bits/signum.h
/dev/null"
fi
-for SIGNAL_H in $sigfile_list
+for SIGNAL_TRY_H in $sigfile_list
do
dnl Try to make sure it doesn't get confused by files that don't
dnl have real signal definitions in, but do #define SIG* by counting
dnl the number of signals. Maybe we could even check for e.g. SIGHUP?
- nsigs=`test -f $SIGNAL_H && \
- grep '#[ ]*define[ ][ ]*SIG[0-9A-Z]*[ ]*[0-9][0-9]*' $SIGNAL_H | \
+ nsigs=`test -f $SIGNAL_TRY_H && \
+ grep '#[ ]*define[ ][ ]*SIG[0-9A-Z]*[ ]*[0-9][0-9]*' $SIGNAL_TRY_H | \
wc -l | sed 's/[ ]//g'`
- test "x$nsigs" != x && test "$nsigs" -ge 7 && break
+ if test "x$nsigs" != x && test "$nsigs" -ge 7
+ then
+ SIGNAL_H="$SIGNAL_H $SIGNAL_TRY_H"
+ fi
done
-if test x$SIGNAL_H = x"/dev/null"; then
+if test x$SIGNAL_H = x; then
AC_MSG_ERROR(SIGNAL MACROS NOT FOUND: please report to developers)
fi
zsh_cv_path_signal_h=$SIGNAL_H
--
2.16.2
Messages sorted by:
Reverse Date,
Date,
Thread,
Author