From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id YMSfLJMHYWafTgAAqHPOHw:P1 (envelope-from ) for ; Thu, 06 Jun 2024 02:49:23 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id YMSfLJMHYWafTgAAqHPOHw (envelope-from ) for ; Thu, 06 Jun 2024 02:49:23 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=MSEKF6zn; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1717634963; a=rsa-sha256; cv=none; b=uFWDIoPo4PiHBtwNeYkNZyMpLBaNl8hWQWZ/QgOdz7oYQqxntn+nGv9Z4tn6I6ojmfNdcA cKLnFqkY711c0jHiJY0jrC3psyTB07iR+EK9PcmSqr6dNNzNFqulcc6peDybFxfjYsE5ce dBEOvhA0DfwGpwdD3pBDuhWspglKak1l5r06/uWnV2xUSCIxvXGy5lJO8edcEw3xUjyTX2 feJBGLM6KwPRK1I2ZImhrLV3UG0Vt1KUM+wXM+QESlqQruHVQtLDVH2X3AOpa0PVzO4FHz 4kWCnhdZa2Em3YtOYd/eKi4sBts009PxR6xCwnH9YXT2iNIAaYxBnlraY02ITg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=MSEKF6zn; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1717634963; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=AiaqA2+EXFwjX21dNzzTl/6y7uC9QURWRHFdaXf0vXQ=; b=F5leKxdUVps58oc2a8yjWQp0UOF+NiM3xWi7Bk/74WgQg5n4kBNeeMXOZNRhIXg/7X2Vmn nNQGlMs5vlBro0kN9QmRPPhVZ8ahYxMN4UI9JbL+Rkyt9zj7ihehf6MneDwZzF1T+tZsEy YmW2CBgTypvG9gBQVt3G4knEmjtubR9tC127SSzVQqcVytYCoz2BEMnskwH6Vorm8Ag5GY ofVzs8z2UrYnSMC/+LyVney+Mk9AzlsqiR+j4vqOWWgPIkH1uQsCyzz0QGAdDSBqxeeSP5 ITgrchrdgLMTwgiwYf2iQG2GcZ6IcFC3sRALiaiwrbCt9Tdr0CJ0mqOxB0POPw== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 2A1881E14D for ; Thu, 6 Jun 2024 02:49:23 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sF1JJ-000111-Sx; Wed, 05 Jun 2024 20:48:57 -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 1sF1JF-0000z4-6Z for bug-guix@gnu.org; Wed, 05 Jun 2024 20:48:53 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sF1JE-00022t-9d; Wed, 05 Jun 2024 20:48:52 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sF1JO-0003ea-3l; Wed, 05 Jun 2024 20:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#47144: [PATCH v4 2/3] gnu: gnulib: Update to 2024-05-30-1.ac4b301. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: mhw@netris.org, ludo@gnu.org, lle-bout@zaclys.net, leo@famulari.name, maxim.cournoyer@gmail.com, zimon.toutoune@gmail.com, bug-guix@gnu.org Resent-Date: Thu, 06 Jun 2024 00:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47144 X-GNU-PR-Package: guix X-GNU-PR-Keywords: security To: 47144@debbugs.gnu.org Cc: Maxim Cournoyer , Mark H Weaver , Ludovic =?UTF-8?Q?Court=C3=A8s?= , =?UTF-8?Q?L=C3=A9o?= Le Bouter , Leo Famulari , Maxim Cournoyer , Simon Tournier X-Debbugs-Original-Xcc: Mark H Weaver , Ludovic =?UTF-8?Q?Court=C3=A8s?= , =?UTF-8?Q?L=C3=A9o?= Le Bouter , Leo Famulari , Maxim Cournoyer , Simon Tournier Received: via spool by 47144-submit@debbugs.gnu.org id=B47144.171763488713903 (code B ref 47144); Thu, 06 Jun 2024 00:49:02 +0000 Received: (at 47144) by debbugs.gnu.org; 6 Jun 2024 00:48:07 +0000 Received: from localhost ([127.0.0.1]:51915 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sF1IR-0003bz-Ht for submit@debbugs.gnu.org; Wed, 05 Jun 2024 20:48:06 -0400 Received: from mail-vs1-f50.google.com ([209.85.217.50]:46303) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sF1IM-0003b4-3E for 47144@debbugs.gnu.org; Wed, 05 Jun 2024 20:48:00 -0400 Received: by mail-vs1-f50.google.com with SMTP id ada2fe7eead31-48bcd69919eso185297137.0 for <47144@debbugs.gnu.org>; Wed, 05 Jun 2024 17:47:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717634796; x=1718239596; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AiaqA2+EXFwjX21dNzzTl/6y7uC9QURWRHFdaXf0vXQ=; b=MSEKF6znhHsCt29bzYWRmxU5V+V4A6C5H0sUuXCSVnxJeI0xNynv9VNWkNJey0RiUr BNCqtQAeBZe7Ej6++CU5q5zsj/w2ohljnJZC9QaqqWlF3Sx2gpAyh+7vEsIqNMahp/2g Ejyv9U1U7dmpg05Nt786MAud7VpQs2EyKElbgwSLp8gI7pa8VL1OsVNy73JqTWUPQ/u3 FJh61RkEIJavmreBPhJHjaDmgWFwMBVabwGGntiKhc3ahopQDknC2LyF5oFbMmIJtzLB u2SXseJjd45WZ5yRmA5Yvd0As3yNPnVzkNwQLNMANyyF++efooeIRjH+1pYhSjcnrJZY X0MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717634796; x=1718239596; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AiaqA2+EXFwjX21dNzzTl/6y7uC9QURWRHFdaXf0vXQ=; b=gHcGuxjl6DLGieGZ1Sda/zq5IZ5gDWRQp9KmxN39Ac2bkD/snYFh+8oBkiGfor6kqg wIUk1bZtjEq5cEBWGiUHa5+OwnCVE848pSi9nUL+4NHHG7xQgnqrTeJyR8QuLN+SlxEr JmvpriiyQWGjo91sB7UrkI/OEMo8/HDuFs3MOa1npb9ozuDro06RuZ3UZSkE5/tIheDl djQoth1+hMAnrA9W3Z58+HCScAqAd4uxYmGBz8nEsxhFhBCCRHJ3i2OzfOgq8q9wR4VE 8hB8gKwo54pwFbULT2DiX6Ris1pXWHRswpLPqRL2exzMAMPLWpIGXRtDILUm39KYJC58 75Qw== X-Gm-Message-State: AOJu0Yywfxf1/PdHZWqthGiyAOUDovhBGO9NBkR610udoVYn0ob1KrCK hAWvQweX7u+NaR7O85CT9+Ou/QejKUNTp8nru1ILjisyZz3SSw4IgOq+Pxa5 X-Google-Smtp-Source: AGHT+IFElxnqLOixVajnZ84fqyIl1QWDhtH4calBF8UwCG7iG6XOShwmmdDemnUdfRuIE0Hm6TakAA== X-Received: by 2002:a67:e454:0:b0:48b:9f36:14 with SMTP id ada2fe7eead31-48c048fd3b8mr4704758137.10.1717634796155; Wed, 05 Jun 2024 17:46:36 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-150.b2b2c.ca. [72.10.133.150]) by smtp.gmail.com with ESMTPSA id af79cd13be357-795332df9b0sm8751085a.126.2024.06.05.17.46.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jun 2024 17:46:35 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 5 Jun 2024 20:46:20 -0400 Message-ID: X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 2A1881E14D X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: 5.66 X-Spam-Score: 5.66 X-TUID: +u4p3oQxhORm Also fix the commands, which would fail due to not finding their implementation scripts. * gnu/packages/patches/gnulib-bootstrap.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/build-tools.scm (gnulib): Update to 2024-05-30-1.ac4b301. [source]: Apply patch. [phases] {patch-source-shebangs, patch-generated-file-shebangs} {patch-usr-bin-file, restore-shebangs}: Delete phases. {disable-failing-tests}: Disable sc_error_message_warn_fatal, sc_prefer_angle_bracket_headers, sc_check_config_h_reminder, sc_prohibit_sc_omitted_at, sc_readme_link_copying, sc_readme_link_install, sc_unsigned_char, sc_unsigned_int, sc_unsigned_long and sc_unsigned_short checks. {regenerate-unicode}: Register BidiMirroring.txt unicode data file. Change-Id: I154b2c5980b671f1e73e7a1f74d926ea080a7aa0 --- (no changes since v1) gnu/local.mk | 1 + gnu/packages/build-tools.scm | 55 ++++++++------- gnu/packages/patches/gnulib-bootstrap.patch | 75 +++++++++++++++++++++ 3 files changed, 107 insertions(+), 24 deletions(-) create mode 100644 gnu/packages/patches/gnulib-bootstrap.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6934d5ccc7..b369127194 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1393,6 +1393,7 @@ dist_patch_DATA = \ %D%/packages/patches/gnome-settings-daemon-gc.patch \ %D%/packages/patches/gnome-session-support-elogind.patch \ %D%/packages/patches/gnome-tweaks-search-paths.patch \ + %D%/packages/patches/gnulib-bootstrap.patch \ %D%/packages/patches/gnumach-support-noide.patch \ %D%/packages/patches/gnupg-default-pinentry.patch \ %D%/packages/patches/gnupg-1-build-with-gcc10.patch \ diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index daaf450e70..82abf5b9f1 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020, 2023 Efraim Flashner ;;; Copyright © 2021 qblade -;;; Copyright © 2021, 2023 Maxim Cournoyer +;;; Copyright © 2021, 2023, 2024 Maxim Cournoyer ;;; Copyright © 2022, 2023 Juliana Sims ;;; ;;; This file is part of GNU Guix. @@ -853,12 +853,15 @@ (define*-public (gnulib-checkout #:key ;; FIXME: tests/uniname/HangulSyllableNames.txt ;; seems like a UCD file but it is not distributed ;; with UCD. - "tests/uniwbrk/WordBreakTest.txt"))))))) + "tests/uniwbrk/WordBreakTest.txt"))))) + (patches (search-patches "gnulib-bootstrap.patch")))) (build-system copy-build-system) (arguments (list #:install-plan #~'(("./gnulib-tool" "bin/") + ("./gnulib-tool.py" "bin/") + ("./gnulib-tool.sh" "bin/") ("." "src/gnulib" #:exclude-regexp ("\\.git.*"))) #:modules '((ice-9 match) (guix build utils) @@ -866,6 +869,13 @@ (define*-public (gnulib-checkout #:key ((guix build gnu-build-system) #:prefix gnu:)) #:phases #~(modify-phases %standard-phases + ;; Since this package is intended to be used in source form, it + ;; should not retain references to tools (with the exception for the + ;; commands we install, which should be wrapper for proper + ;; execution). + (delete 'patch-source-shebangs) + (delete 'patch-generated-file-shebangs) + (delete 'patch-usr-bin-file) (add-before 'install 'check (assoc-ref gnu:%standard-phases 'check)) (add-before 'check 'fix-tests @@ -889,8 +899,10 @@ (define*-public (gnulib-checkout #:key sc_Wundef_boolean \\ sc_copyright_check \\ sc_file_system \\ + sc_error_message_warn_fatal \\ sc_indent \\ sc_keep_gnulib_texi_files_mostly_ascii \\ + sc_prefer_angle_bracket_headers \\ sc_prohibit_assert_without_use \\ sc_prohibit_close_stream_without_use \\ sc_prohibit_defined_have_decl_tests \\ @@ -899,15 +911,22 @@ (define*-public (gnulib-checkout #:key sc_prohibit_intprops_without_use \\ sc_prohibit_openat_without_use \\ sc_prohibit_test_minus_ao \\ - sc_unportable_grep_q")) + sc_readme_link_copying \\ + sc_readme_link_install \\ + sc_unportable_grep_q \\ + sc_unsigned_char \\ + sc_unsigned_int \\ + sc_unsigned_long \\ + sc_unsigned_short")) (substitute* "Makefile" - (("sc_check_(sym_list|copyright)" rule) + (("sc_check_(sym_list|copyright|config_h_reminder)" rule) (string-append "disabled_check_" rule)) (("sc_cpp_indent_check") "disabled_cpp_indent_check") (("sc_prefer_ac_check_funcs_once") "disabled_prefer_ac_check_funcs_once") - (("sc_prohibit_(AC_LIBOBJ_in_m4|leading_TABs)" rule) + (("sc_prohibit_(AC_LIBOBJ_in_m4|leading_TABs\ +|sc_omitted_at)" rule) (string-append "disabled_prohibit_" rule))))) (add-before 'check 'regenerate-unicode (lambda* (#:key inputs #:allow-other-keys) @@ -939,7 +958,8 @@ (define*-public (gnulib-checkout #:key (sha256 (base32 "0k6wyijyzdl5g3nibcwfm898kfydx1pqaz28v7fdvnzdvd5fz7lh")))) - (find-ucd-files "EastAsianWidth.txt" + (find-ucd-files "BidiMirroring.txt" + "EastAsianWidth.txt" "LineBreak.txt" "auxiliary/WordBreakProperty.txt" "auxiliary/GraphemeBreakProperty.txt" @@ -962,22 +982,9 @@ (define*-public (gnulib-checkout #:key ("NormalizationTest.txt" . "uninorm") ("auxiliary/GraphemeBreakTest.txt" . "unigbrk") ("auxiliary/WordBreakTest.txt" . "uniwbrk"))) - (delete-file "gen-uni-tables")))) - (add-after 'install 'restore-shebangs - (lambda _ - (substitute* (find-files - (string-append #$output "/src/gnulib") - (lambda (fname stat) - (and (not (string-suffix? "/lib/javaversion.class" fname)) - (not (string-suffix? ".mo" fname))))) - (("^#! ?(.*)/bin/sh" _ prefix) - "#!/bin/sh") - (("^#! ?(.*)/bin/python3" _ prefix) - "#!/usr/bin/env python3") - (("^#! ?(.*)/bin/([a-zA-Z0-9-]+)" _ prefix program) - (string-append "#!/usr/bin/" program)))))))) + (delete-file "gen-uni-tables"))))))) (inputs - (list bash-minimal)) ;shebang for gnulib-tool + (list bash-minimal)) ;shebang for gnulib-tool (native-inputs (list bash-minimal python perl clisp @@ -1005,9 +1012,9 @@ (define*-public (gnulib-checkout #:key (define-public gnulib (gnulib-checkout - #:version "2022-12-31" - #:commit "875461ffdf58ac04677957b4ae4160465b83b940" - #:hash (base32 "0bf7a6wdns9c5wwv60qfcn9llg0j6jz5ryd2qgsqqx2i6xkmp77c"))) + #:version "2024-05-30" + #:commit "ac4b301ae15223c98b51cd5a0eda2e2cf57c817b" + #:hash (base32 "0f4w56fc97clg13mmdghx84dh9xqmaqr3j672ppfh3h66gmmmvzs"))) (define-public pdpmake (package diff --git a/gnu/packages/patches/gnulib-bootstrap.patch b/gnu/packages/patches/gnulib-bootstrap.patch new file mode 100644 index 0000000000..c0c9a5e732 --- /dev/null +++ b/gnu/packages/patches/gnulib-bootstrap.patch @@ -0,0 +1,75 @@ +From adbf7ce2c2b03ce5ee25d4c68f9bb247b0dcbc2b Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer +Date: Thu, 30 May 2024 14:48:04 -0400 +Subject: [PATCH] bootstrap: Use gnulib-tool from PATH if available. + +Some distributions such as GNU Guix include in their package for +gnulib a 'gnulib-tool' command under their $bindir +prefix (e.g. '/bin') for users to use, along the unmodified full +sources. The idea is that any wrapping or distribution modifications +for the *execution* of the script at run time is done on these +commands, while the rest of the source should be in their +pristine (unmodified) version. Adjust the 'gnulib-tool' discovery +mechanism to support such installation layout. + +* build-aux/bootstrap (autogen) : Prefer to use from +PATH, else from $GNULIB_SRCDIR/../../bin/gnulib-tool, else from +$GNULIB_SRCDIR/gnulib-tool. +* gnulib-tool.sh (func_gnulib_dir): Honor GNULIB_SRCDIR to locate +gnulib's main directory. +--- + build-aux/bootstrap | 11 +++++++++-- + gnulib-tool.sh | 6 +++++- + 2 files changed, 14 insertions(+), 3 deletions(-) + +diff --git a/build-aux/bootstrap b/build-aux/bootstrap +index 6295b8a128..06271eea8b 100755 +--- a/build-aux/bootstrap ++++ b/build-aux/bootstrap +@@ -3,7 +3,7 @@ + + # Bootstrap this package from checked-out sources. + +-scriptversion=2024-04-13.15; # UTC ++scriptversion=2024-05-30.20; # UTC + + # Copyright (C) 2003-2024 Free Software Foundation, Inc. + # +@@ -1164,7 +1164,14 @@ autogen() + fi + + if $use_gnulib; then +- gnulib_tool=$GNULIB_SRCDIR/gnulib-tool ++ gnulib_tool=$(command -v gnulib-tool) ++ if test -x "$gnulib_tool"; then ++ : # done ++ elif test -x $GNULIB_SRCDIR/../../bin/gnulib-tool; then ++ gnulib_tool=$GNULIB_SRCDIR/../../bin/gnulib-tool ++ else ++ gnulib_tool=$GNULIB_SRCDIR/gnulib-tool ++ fi + <$gnulib_tool || return + fi + +diff --git a/gnulib-tool.sh b/gnulib-tool.sh +index 12f0b82461..0aefbe2b2b 100755 +--- a/gnulib-tool.sh ++++ b/gnulib-tool.sh +@@ -518,7 +518,11 @@ func_gnulib_dir () + * ) self_abspathname=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`/"$linkval" ;; + esac + done +- gnulib_dir=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'` ++ if test -n "$GNULIB_SRCDIR"; then ++ gnulib_dir=$GNULIB_SRCDIR ++ else ++ gnulib_dir=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'` ++ fi + } + + # func_tmpdir + +base-commit: ac4b301ae15223c98b51cd5a0eda2e2cf57c817b +-- +2.41.0 + -- 2.45.1