From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21374 invoked by alias); 10 Apr 2018 12:42:27 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: List-Unsubscribe: X-Seq: 42618 Received: (qmail 6279 invoked by uid 1010); 10 Apr 2018 12:42:27 -0000 X-Qmail-Scanner-Diagnostics: from mail-wr0-f193.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(209.85.128.193):SA:0(-1.9/5.0):. Processed in 15.156163 secs); 10 Apr 2018 12:42:27 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, SPF_PASS,T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.1 X-Envelope-From: benedikt.morbach@googlemail.com X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | 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== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=9I8EYNPCNlbOkoDYPjyKv5QVcaHHO7MTHdNi1V4Usdk=; b=DzG/tC34r1Lq/HFlX440pLp7f3O/IBHdwKwu0IHaJBZ0X2NASLjswHPhN9+enebBOa 5XkAET18AgKUDd490U6RXFAgv/wEpG2P+UzznNtYWA+ZerKEr3Ci1hkqWccZxdfHg81V O7Dxa6phWVp2vrSgxN9inAHog4m37xfuwqGG60gaPr7ZyNOuTRKit6sPSiU2cfztKhMP 89Tx6/m6oxrrqIXH9UTnS9tttKP8weO89RwNHaRpq2TsAvM8nbHH23jzLfdGpDrT2puX Fr9C7h2x9KSya1q8LkZ3R0jNYZI7z6TcOr9A2JUW7elqwqgPB5AOEJ3tYGg/HhMaBkHB liVQ== X-Gm-Message-State: ALQs6tACHfzT8GIkhg8dOSnnk2vkCN3Om3onXrQFrahRdLrMpz8/OC1v RCYykjkq1symyB+SXXG1tZAkETs7 X-Google-Smtp-Source: AIpwx4+KqoUlMdKgwrI52KpmjIRxmzcMDhcRrdfGzDKuUW9008ddHsskQaM7qj1Ypv0ZXLKWhit4hg== X-Received: by 10.223.141.143 with SMTP id o15mr207707wrb.272.1523364127890; Tue, 10 Apr 2018 05:42:07 -0700 (PDT) From: Benedikt Morbach To: zsh-workers@zsh.org Cc: Benedikt Morbach Subject: [PATCH] configure: support split signal.h Date: Tue, 10 Apr 2018 14:41:58 +0200 Message-Id: <20180410124158.32182-1-benedikt.morbach@googlemail.com> X-Mailer: git-send-email 2.16.2 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