From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5494 invoked by alias); 12 Apr 2018 15:52:33 -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: 42629 Received: (qmail 26237 invoked by uid 1010); 12 Apr 2018 15:52:33 -0000 X-Qmail-Scanner-Diagnostics: from mail-wm0-f48.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(74.125.82.48):SA:0(-1.9/5.0):. Processed in 6.999459 secs); 12 Apr 2018 15:52:33 -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, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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=2cs7CSkLhJnoiUBV8LTbEMJYUQlN4mSISZnPE7RyLws=; b=HU8jE/BkeO/OZ9xRKK98PJYC/Ov+S/fyv8SulPmRWDbGAl/3wlTwa/eC4u7hgY1kZ+ HmgaiRAdgP+itdBrzarE/SE54Alyn5sCdaN7BXVisX1jqdDh9WZsbJZTsWhIz7fqOsrm 81N8IZvMvLl1N7QrxGYRnPE/zg0q/4SPlx98AjqKUPrelDxqxVuS3VdJqJ86mxyuuXFo lfJmYxqYzlPMuuNEbYKZ9mwFBj5I2LnoSVxvdNy9+6kkVDOYF/2eSmjBtWIESnbnmbH/ RmC7mV8ww7rXr4u74GL8IcXxSn8vQe+bi/nc6wVcYResyXBSOultmqUcUSHR6+jbqlBK d5+w== 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=2cs7CSkLhJnoiUBV8LTbEMJYUQlN4mSISZnPE7RyLws=; b=lBEW1u79EZZzURZ7T/P+VkUkNfZGNL37/JfJZQcYzLkt/lbzKLNHoqaVUudz8iGT1Z 3r4wABluo5+bCZhnxy/q4VHPGP8AyL+xWG1QIHYXIO4V9EjvmUUN39J0I2K2O+BYaaLC U+3qe5fKYPXII/zVd+ICVuQHLVqON9dC+a62zTOiJcunKhS3zcQV6kHk3XHwp65j8GE4 5HKNcg1kvU2PZGEDMs2pJ1bw+TOfw3DV9w05xy3pqbWde61UwS5rnECR4+ot4uQj8rNA O5qHJcpLSSMEoT9C/CquDalaM+0ZxRrlNqtX6l/K+a1AO1grqR6ySh14PKb6QbN3b8Qd ckGw== X-Gm-Message-State: ALQs6tDlKuwRQkiVSrM8ocw3OtzUXi/eN74G0ovUxghHmjqUs+nxytBV l6sdC2gqUTZtNshRX1spHKSOKAua X-Google-Smtp-Source: AIpwx48Pedji5pFSK0AF+mWgELfsJ6fb1wzm9HTRwh1LDjTa9PX+pPjJPGCW5UltPfK8aqFtFy9+RQ== X-Received: by 10.28.66.148 with SMTP id k20mr1091582wmi.1.1523548341974; Thu, 12 Apr 2018 08:52:21 -0700 (PDT) From: Benedikt Morbach To: zsh-workers@zsh.org Cc: Benedikt Morbach Subject: [PATCH] configure: support split signal.h Date: Thu, 12 Apr 2018 17:52:13 +0200 Message-Id: <20180412155213.7768-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 --- v2: Fix error reported by Alexander Kapshuna[2] (quoted x$SIGNAL_H) > checking where signal.h is located... ./configure: line 8998: test: too many arguments > /usr/x86_64-pc-linux-gnu/include/bits/signum.h /usr/x86_64-pc-linux-gnu/include/bits/signum-generic.h [2] http://www.zsh.org/mla/workers/2018/msg00426.html configure.ac | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 1a498f8b2..38776742c 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