From unknown Sun Jun 22 08:06:16 2025 X-Loop: help-debbugs@gnu.org Subject: bug#63605: FYI: build improvement+fix Resent-From: Jim Meyering Original-Sender: "Debbugs-submit" Resent-CC: bug-diffutils@gnu.org Resent-Date: Sat, 20 May 2023 10:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63605 X-GNU-PR-Package: diffutils X-GNU-PR-Keywords: To: 63605@debbugs.gnu.org X-Debbugs-Original-To: bug-diffutils@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168457674617161 (code B ref -1); Sat, 20 May 2023 10:00:02 +0000 Received: (at submit) by debbugs.gnu.org; 20 May 2023 09:59:06 +0000 Received: from localhost ([127.0.0.1]:57908 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q0JMg-0004Si-7P for submit@debbugs.gnu.org; Sat, 20 May 2023 05:59:06 -0400 Received: from lists.gnu.org ([209.51.188.17]:45320) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q0JMd-0004SV-Nm for submit@debbugs.gnu.org; Sat, 20 May 2023 05:59:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q0JMd-0003WC-HE for bug-diffutils@gnu.org; Sat, 20 May 2023 05:59:03 -0400 Received: from mail-qv1-xf30.google.com ([2607:f8b0:4864:20::f30]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q0JMb-0007n2-MG for bug-diffutils@gnu.org; Sat, 20 May 2023 05:59:03 -0400 Received: by mail-qv1-xf30.google.com with SMTP id 6a1803df08f44-62381fe42b3so19279066d6.0 for ; Sat, 20 May 2023 02:59:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684576739; x=1687168739; h=mime-version:message-id:date:subject:to:from:sender:from:to:cc :subject:date:message-id:reply-to; bh=UymVQ9Ei/21P0STF3f6WK/1BMmlcht7B9Q56LAqwlzQ=; b=iLcwFJzoJBa8BzDUM1Dex617AN3wpB125Nl953TKKrvAz1iSsO4GortjMfO0nxmaPY mrNc5gB66WPNb8ceaSi66C/PtVvGSH/NqVl31J+zwB+C2LKqx2Bhln0q84O8tPaav7eN ye4w0hrU0rpOF2h5Xu88AMMKLAucrJBWdBIOiKXjV6JYJN5YUnYzT8qUYP2R4bWSlOlf 4qJBZ+kz7wsccdaaubGz6yfdFVDiTffDSXw02M+RNBDtfchJaPpvW6Ys0/b16R8nPcvt PkGasLIPFBQppr1Vgfojk59HR6lLMpoR7o2W1kPx9L/J6djwUUYowhnPVQCndBNGNWPq gBVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684576739; x=1687168739; h=mime-version:message-id:date:subject:to:from:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=UymVQ9Ei/21P0STF3f6WK/1BMmlcht7B9Q56LAqwlzQ=; b=gnEDm3r9PqIUJLrPligSnYBILYHCxHP0Qv4kY/sDM0ElfAMSyoU69J1jD/pLfgE5iX xUhsKkE4OGfq6Bx6nRrg4JfsxO9Y/1aLf4cY5nrVubyfuc9pD6AnAr8Z2DQH59KEz6J5 NpzqWs0dhIgJ9tQx1aj9Lsm8bew0NsPSU6v6irOflIusTIn7q7BhaTJIMspl1wbp8tRz wo+7cKTE+uLhQ7FErK7jAx2/6VxEnpb6IqXZJXWCDpZ9P19zTjUyRipld/ZYu9+X8WVT m54AsNCdSj8RvlAGvBUSSBvZw+Pba1f5IziqU6EKRFeRkn4DYNQ87qHM8GbMs5+6J1eR iTxA== X-Gm-Message-State: AC+VfDzoaKNJspLti04RcjP91Dky9CIG0r0LJgi44PjlD/gzJbcK0ePJ 3zEZTRDKPAuhVU/1AtgJc5hvQuknltjLuQ== X-Google-Smtp-Source: ACHHUZ7c6enNfOjZuNlLckUxbggi7rgz0vSRx27boZbme6eKRJQss3j2XiT1HaeLPxFC6g5bAzH2Ng== X-Received: by 2002:a05:6214:27c7:b0:5b3:e172:b63e with SMTP id ge7-20020a05621427c700b005b3e172b63emr8203548qvb.22.1684576739162; Sat, 20 May 2023 02:58:59 -0700 (PDT) Received: from meyering-mbp ([2620:10d:c091:400::5:76e6]) by smtp.gmail.com with ESMTPSA id ei18-20020ad45a12000000b005f2dba7a5b0sm450354qvb.132.2023.05.20.02.58.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 May 2023 02:58:57 -0700 (PDT) From: Jim Meyering Date: Sat, 20 May 2023 11:58:54 +0200 Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=2607:f8b0:4864:20::f30; envelope-from=meyering@gmail.com; helo=mail-qv1-xf30.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.1 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable I've just pushed these: build: modernize bootstrap prerequsite tools Following P=C3=A1draig Brady's example from coreutils, ... * bootstrap.conf: Add an explicit requirement on m4. Add an explicit requirement on texi2pdf which is often packaged separately to makeinfo and induces a failure far down the distribution phase if not present. Replace the rsync dependency with wget, which gnulib changed to in 2018. Also, add an xz requirement and a version for autopoint. build: fix a new syntax-check failure * src/diff.h (robust_output_style): Put DIFF_INLINE and the function name on the same line, so that syntax-check's naive parsing can spot this function. * cfg.mk (_gl_TS_extern): Add DIFF_INLINE. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=diff-build-2.diff Content-Transfer-Encoding: quoted-printable >From 55260678d9cb3269a853916a59f1b8842c4d87e4 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 20 May 2023 02:16:52 -0700 Subject: [PATCH 1/2] build: modernize bootstrap prerequsite tools MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit Following P=C3=A1draig Brady's example from coreutils, ... * bootstrap.conf: Add an explicit requirement on m4. Add an explicit requirement on texi2pdf which is often packaged separately to makeinfo and induces a failure far down the distribution phase if not present. Replace the rsync dependency with wget, which gnulib changed to in 2018. Also, add an xz requirement and a version for autopoint. --- bootstrap.conf | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 83e08ab..6630b15 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -124,18 +124,21 @@ gnulib_tool_option_extras=3D"--tests-base=3Dgnulib-te= sts # Build prerequisites buildreq=3D"\ -autoconf 2.62 +autoconf 2.64 automake 1.12.2 -autopoint - +autopoint 0.19.2 gettext 0.19.2 git 1.4.4 gperf - gzip - help2man - +m4 - makeinfo - perl 5.5 -rsync - +texi2pdf 6.1 tar - +wget - +xz - " bootstrap_post_import_hook () --=20 2.41.0.rc0.4.g004e0f790f >From b079f08cc9b7236e7ada9edc3764ce14e3828b54 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 20 May 2023 02:43:07 -0700 Subject: [PATCH 2/2] build: fix a new syntax-check failure * src/diff.h (robust_output_style): Put DIFF_INLINE and the function name on the same line, so that syntax-check's naive parsing can spot this function. * cfg.mk (_gl_TS_extern): Add DIFF_INLINE. --- cfg.mk | 2 +- src/diff.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cfg.mk b/cfg.mk index e21ff19..b58175e 100644 --- a/cfg.mk +++ b/cfg.mk @@ -74,4 +74,4 @@ exclude_file_name_regexp--sc_space_tab =3D ^gl/lib/.*\.c\= .diff$$ exclude_file_name_regexp--sc_prohibit_doubled_word =3D ^tests/y2038-vs-32b= it$$ # Tell gnulib's tight_scope rule that we mark externs with XTERN -export _gl_TS_extern =3D extern|XTERN +export _gl_TS_extern =3D extern|XTERN|DIFF_INLINE diff --git a/src/diff.h b/src/diff.h index 276e2d4..75d5ab0 100644 --- a/src/diff.h +++ b/src/diff.h @@ -96,8 +96,7 @@ enum output_style /* True for output styles that are robust, i.e. can handle a file that ends in a non-newline. */ -DIFF_INLINE bool -robust_output_style (enum output_style s) +DIFF_INLINE bool robust_output_style (enum output_style s) { return s !=3D OUTPUT_ED && s !=3D OUTPUT_FORWARD_ED; } --=20 2.41.0.rc0.4.g004e0f790f --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat May 20 06:13:38 2023 Received: (at control) by debbugs.gnu.org; 20 May 2023 10:13:38 +0000 Received: from localhost ([127.0.0.1]:57920 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q0Jak-0004sn-GG for submit@debbugs.gnu.org; Sat, 20 May 2023 06:13:38 -0400 Received: from mail-lj1-f171.google.com ([209.85.208.171]:46261) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q0Jai-0004sW-QV for control@debbugs.gnu.org; Sat, 20 May 2023 06:13:37 -0400 Received: by mail-lj1-f171.google.com with SMTP id 38308e7fff4ca-2af177f12d1so33110681fa.0 for ; Sat, 20 May 2023 03:13:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684577610; x=1687169610; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=gMLMl8vWQBePep/VQ+BITqcPJWKKPOBFrWXQt5wyeCA=; b=gBu7kNLnEXED3bQ0yUBrteGXMo1lp5pO/xYGI3YQpQy72ubIMHRnYGbhQn7/c2tpgI l5eJHAluJH81drCVr7hMj05FxIUDV+/Bg/b5RRz1S/fBQsf1ea8V1R7cBl8gzNg+iUic TWJZZ/AxyfH8XG/GiLnuJL+1z69SrPvN7KdFqFcBS1/QwLhKZM+n88FTnTCbIZONa5N3 Og3y6+d4YvZ693NjjJKwwhaq+0kSU2hFlybVPn1KwQd6joFImsiJ7s/Nm+Qpl/6JIlTm nxathjerxtSiLP1JEXBmEbfaS6IsbojG+pnxk3DXnYfJdZLbzrVDFuNcW/a1TD9tT28R vTRA== X-Gm-Message-State: AC+VfDyxrlBMrN0lN4gUTlC8fmhD9auvWgrSrCT936Bg4xCm1kOrS8ZW ews+dZf5+5jt8RAB7sZg9WHITBJOCTqp2dmsqNH2338hPEaSQw== X-Google-Smtp-Source: ACHHUZ6VxDDV4NjsVwBaTXdY3mECKcOEJICi1OIiK1kDhWl/m9AX759hKDPXzMJF0PWcmd47sAzvstWw0LvjQDWGS28= X-Received: by 2002:ac2:5fae:0:b0:4ed:b4f9:28c7 with SMTP id s14-20020ac25fae000000b004edb4f928c7mr1581880lfe.6.1684577609570; Sat, 20 May 2023 03:13:29 -0700 (PDT) MIME-Version: 1.0 From: Jim Meyering Date: Sat, 20 May 2023 12:13:17 +0200 Message-ID: Subject: close To: GNU bug tracker automated control server Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) close 63605 done