From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id MLFOG97xsWM1UwAAbAwnHQ (envelope-from ) for ; Sun, 01 Jan 2023 21:49:34 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id CMhuG97xsWPTKwAA9RJhRA (envelope-from ) for ; Sun, 01 Jan 2023 21:49:34 +0100 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 256C537569 for ; Sun, 1 Jan 2023 21:49:34 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pC5GS-0007Zm-BC; Sun, 01 Jan 2023 15:49:04 -0500 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 1pC5GR-0007Yk-40 for guix-patches@gnu.org; Sun, 01 Jan 2023 15:49:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pC5GQ-0000MT-SA for guix-patches@gnu.org; Sun, 01 Jan 2023 15:49:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pC5GQ-00016l-OP for guix-patches@gnu.org; Sun, 01 Jan 2023 15:49:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60358] [PATCH v11 3/4] gnu: Add gnulib. References: In-Reply-To: Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 01 Jan 2023 20:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60358 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60358@debbugs.gnu.org Received: via spool by 60358-submit@debbugs.gnu.org id=B60358.16726060894104 (code B ref 60358); Sun, 01 Jan 2023 20:49:02 +0000 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 20:48:09 +0000 Received: from localhost ([127.0.0.1]:41886 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC5FY-000143-LC for submit@debbugs.gnu.org; Sun, 01 Jan 2023 15:48:09 -0500 Received: from planete-kraus.eu ([89.234.140.182]:40142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC5FR-000124-Fv for 60358@debbugs.gnu.org; Sun, 01 Jan 2023 15:48:03 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 289a6c10 for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 20:47:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h=from :date:subject:to:message-id:mime-version; s=dkim; bh=Wm1XgUIhpOs R9Ts4LvO1lgxgdZU=; b=qh5hFqXhwEaFcVptSNDkvvNxfiEqdxo6dCcLtugMhIt pDvhyhT8Z8MTE5ztb600Uz1LsmMkwso0PpOlvbsUiHtabwtCVX/uiZJNG9RkRE83 gn2SNFg3KfSLZRY0Yu5GBd2hBir2UMCyExhTW/OhRAsmtjW7ICX34FgFyfhPrO5k = Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id b863397c (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60358@debbugs.gnu.org>; Sun, 1 Jan 2023 20:47:57 +0000 (UTC) Date: Tue, 27 Dec 2022 17:23:30 +0100 Message-ID: <8f3409e46325bae45614dd0661b32f6af4f2dc4e.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches From: Vivien Kraus via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1672606174; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: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=uHhRyH6aDZ+9hIdpG4c38VwjSLXz89QAMPT3xnqkvXo=; b=Gqmciw597E64QyCw9z5MgAxJifdQn64RjTNPvYAVeWgt9y/Pu89QrPFyRBDdVv7nCCw1+q jSi4/c9DqxFQ/VT+jn2NOFwAMlNznbZ0hZ6PzIhWD23I3kSSOX1UwAgBxJgyAjKxN7iTxK w8R9kyIDRV+q3IrgzEcUXE1TGESAXmUrZImfhri8CIcAIfR2AKh55BjZ+e7JGnSiC7AEMx pluIY3oJpEdG5pEjutTcjh9Lyq++D3RZplkcCILUSJF7W1SFZ2HCD8aXrQODWTwJ0HOSoM j9OznsHaiux+1w8lK7aXo7n+BMEUl75YnChDd7Z5yzawuQ/y8+qmnQ1y5TznTw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b=qh5hFqXh; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1672606174; a=rsa-sha256; cv=none; b=W6raqRgKRq+G8dOpgmzMeAGhc7WA8GosBwck90IDmWl433rP4FWNIbCFZQtdjIk1qAecsA h4x1FmsN/5QOAEIH2p7XZtXzkPhH9y7lxkewJMl6yw21XaicWCDcJxUhn1J4tVhtz8hkOP F++jKX7NTNWY/5okWlTE2eJ+sm4jnRTAurcyaU7An1SvkSXM+MT3VLyS+G7WKRlmzjpDzt rc5TWfOc0r/FaTjFEc2KcVPs2kSitURjAptzCdY6HvnFcuT9YPc/JEDRsAt3lWxCFK8ZPW FizTUSanxsjJKOOiRpYBKJNNbNK6wPXE7VvYfrNejEIxHk1Wp4uZDktH+mwTrw== X-Spam-Score: 2.45 X-Migadu-Queue-Id: 256C537569 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b=qh5hFqXh; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: 2.45 X-TUID: Jmk0OVPLnqJ+ * gnu/packages/build-tools.scm (gnulib-checkout, gnulib): New variables. --- gnu/packages/build-tools.scm | 202 +++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 6c1350c44f..5f6d0c6b4e 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -32,6 +32,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages build-tools) + #:use-module (ice-9 optargs) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils) #:use-module (guix packages) @@ -39,20 +40,28 @@ (define-module (gnu packages build-tools) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) + #:use-module (guix modules) #:use-module (gnu packages) #:use-module (gnu packages adns) + #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages check) + #:use-module (gnu packages code) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) + #:use-module (gnu packages cppi) #:use-module (gnu packages elf) + #:use-module (gnu packages gcc) #:use-module (gnu packages linux) + #:use-module (gnu packages lisp) #:use-module (gnu packages logging) #:use-module (gnu packages lua) #:use-module (gnu packages ninja) #:use-module (gnu packages package-management) #:use-module (gnu packages pcre) + #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pretty-print) #:use-module (gnu packages protobuf) @@ -65,6 +74,7 @@ (define-module (gnu packages build-tools) #:use-module (gnu packages rpc) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) + #:use-module (gnu packages unicode) #:use-module (gnu packages version-control) #:use-module (guix build-system gnu) #:use-module (guix build-system python)) @@ -803,3 +813,195 @@ (define-public genie same settings to multiple projects. It supports generating projects using GNU Makefiles, JSON Compilation Database, and experimentally Ninja.") (license license:bsd-3)))) + +(define*-public (gnulib-checkout #:key + version + (revision "1") + commit + hash) + "Return as a package the exact gnulib checkout." + (package + (name "gnulib") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/gnulib.git/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 hash) + (snippet + (with-imported-modules (source-module-closure '((guix build utils))) + #~(begin + (use-modules (guix build utils) + (ice-9 ftw) + (ice-9 rdelim)) + ;; .c, .h and .gperf files whose first line is /* DO NOT EDIT! + ;; GENERATED AUTOMATICALLY! */ are generated automatically based + ;; on the unicode database. Since we replace the unicode + ;; database with our own, we need to regenerate them. So, they + ;; are removed from the source. They are sprinkled all over the + ;; place unfortunately, so we can’t exclude whole directories. + (let ((generated-automatically? + (lambda (filename . unused) + (and (or (string-suffix? ".c" filename) + (string-suffix? ".h" filename) + (string-suffix? ".gperf" filename)) + (call-with-input-file filename + (lambda (port) + (let ((first-line (read-line port))) + (equal? + first-line + "/* DO NOT EDIT! GENERATED AUTOMATICALLY! */")))))))) + (for-each delete-file (find-files (getcwd) generated-automatically?))) + ;; Other files are copied from UCD. + (for-each delete-file + '("tests/unigbrk/GraphemeBreakTest.txt" + "tests/uninorm/NormalizationTest.txt" + "tests/uniname/UnicodeData.txt" + "tests/uniname/NameAliases.txt" + ;; FIXME: tests/uniname/HangulSyllableNames.txt + ;; seems like a UCD file but it is not distributed + ;; with UCD. + "tests/uniwbrk/WordBreakTest.txt"))))))) + (build-system copy-build-system) + (arguments + (list + #:install-plan + #~'(("./gnulib-tool" "bin/") + ("." "src/gnulib" #:exclude-regexp ("\\.git.*"))) + #:modules '((ice-9 match) + (guix build utils) + (guix build copy-build-system) + ((guix build gnu-build-system) #:prefix gnu:)) + #:phases + #~(modify-phases %standard-phases + (add-before 'install 'check + (assoc-ref gnu:%standard-phases 'check)) + (add-before 'check 'fix-tests + (lambda _ + (substitute* "Makefile" + (("-f maint.mk syntax-check") + "_gl-Makefile=yes -f maint.mk syntax-check")) + (invoke "git" "init") + (invoke "git" "config" "user.name" "Guix") + (invoke "git" "config" "user.email" "guix@localhost") + (invoke "git" "add" ".") + ;; Syntax checks are only run against committed files. + (invoke "git" "commit" "-m" "Prepare for tests."))) + (add-before 'check 'disable-failing-tests + (lambda _ + (substitute* "cfg.mk" + (("local-checks-to-skip =") + ;; sc_copyright_check fails because the fake commit date may + ;; be later than the copyright year. + "local-checks-to-skip = \\ + sc_Wundef_boolean \\ + sc_copyright_check \\ + sc_file_system \\ + sc_indent \\ + sc_keep_gnulib_texi_files_mostly_ascii \\ + sc_prohibit_assert_without_use \\ + sc_prohibit_close_stream_without_use \\ + sc_prohibit_defined_have_decl_tests \\ + sc_prohibit_doubled_word \\ + sc_prohibit_empty_lines_at_EOF \\ + sc_prohibit_intprops_without_use \\ + sc_prohibit_openat_without_use \\ + sc_prohibit_test_minus_ao \\ + sc_unportable_grep_q")) + (substitute* "Makefile" + (("sc_check_(sym_list|copyright)" 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) + (string-append "disabled_prohibit_" rule))))) + (add-before 'check 'regenerate-unicode + (lambda* (#:key inputs #:allow-other-keys) + (define (find-ucd-file name) + (search-input-file inputs (string-append "share/ucd/" name))) + (define (find-ucd-files . names) + (map find-ucd-file names)) + (with-directory-excursion "lib" + ;; See the compile-command buffer-local variable in + ;; lib/gen-uni-tables.c + (invoke #+(file-append gcc "/bin/gcc") "-O" "-Wall" "gen-uni-tables.c" + "-Iunictype" "-o" "gen-uni-tables") + (apply invoke + "./gen-uni-tables" + (append + (find-ucd-files "UnicodeData.txt" + "PropList.txt" + "DerivedCoreProperties.txt" + "emoji/emoji-data.txt" + "ArabicShaping.txt" + "Scripts.txt" + "Blocks.txt") + (list + #$(origin + (method url-fetch) + (uri (string-append + "https://www.unicode.org/Public/" + "3.0-Update1/PropList-3.0.1.txt")) + (sha256 + (base32 + "0k6wyijyzdl5g3nibcwfm898kfydx1pqaz28v7fdvnzdvd5fz7lh")))) + (find-ucd-files "EastAsianWidth.txt" + "LineBreak.txt" + "auxiliary/WordBreakProperty.txt" + "auxiliary/GraphemeBreakProperty.txt" + "CompositionExclusions.txt" + "SpecialCasing.txt" + "CaseFolding.txt") + (list #$(package-version (this-package-native-input "ucd"))))) + (invoke "clisp" "-C" "uniname/gen-uninames.lisp" + (find-ucd-file "UnicodeData.txt") + "uniname/uninames.h" + (find-ucd-file "NameAliases.txt")) + (for-each + (match-lambda + ((ucd-file . directory) + (copy-file (find-ucd-file ucd-file) + (string-append "../tests/" directory "/" + (basename ucd-file))))) + '(("NameAliases.txt" . "uniname") + ("UnicodeData.txt" . "uniname") + ("NormalizationTest.txt" . "uninorm") + ("auxiliary/GraphemeBreakTest.txt" . "unigbrk") + ("auxiliary/WordBreakTest.txt" . "uniwbrk"))) + (delete-file "gen-uni-tables"))))))) + (inputs ;; Shebangs for some auxiliary build files. + (list python perl clisp)) + (native-inputs + (list + python perl clisp + ;; Unicode data: + ucd-next + ;; Programs for the tests: + cppi indent git autoconf)) + (home-page "https://www.gnu.org/software/gnulib/") + (synopsis "Source files to share among distributions") + (description + "Gnulib is a central location for common infrastructure needed by GNU +packages. It provides a wide variety of functionality, e.g., portability +across many systems, working with Unicode strings, cryptographic computation, +and much more. The code is intended to be shared at the level of source +files, rather than being a standalone library that is distributed, built, and +installed. The included @command{gnulib-tool} script helps with using Gnulib +code in other packages. Gnulib also includes copies of licensing and +maintenance-related files, for convenience.") + (native-search-paths + (list (search-path-specification + (variable "GNULIB_SRCDIR") + (files (list "src/gnulib"))))) + (license (list license:lgpl2.0+ license:gpl3+)))) + +(define-public gnulib + (gnulib-checkout + #:version "2022-12-31" + #:commit "875461ffdf58ac04677957b4ae4160465b83b940" + #:hash (base32 "0bf7a6wdns9c5wwv60qfcn9llg0j6jz5ryd2qgsqqx2i6xkmp77c"))) -- 2.38.1