From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 02 14:47:50 2023 Received: (at 60358) by debbugs.gnu.org; 2 Jan 2023 19:47:50 +0000 Received: from localhost ([127.0.0.1]:44084 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCQmj-0007NO-KE for submit@debbugs.gnu.org; Mon, 02 Jan 2023 14:47:50 -0500 Received: from planete-kraus.eu ([89.234.140.182]:37364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCQmh-0007Mu-My for 60358@debbugs.gnu.org; Mon, 02 Jan 2023 14:47:49 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id efff2394 for <60358@debbugs.gnu.org>; Mon, 2 Jan 2023 19:47:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to :mime-version; s=dkim; bh=iQMd2Rs6bbVsCwxMDd+pMyYQTG0=; b=r7f7tr sSHt5wCyt6pchKuRPifKntnsgvLx1qeWd+5wtdIATKnZ9ZqsFq0sjQhkrEvD5PTL WsGFlPEQ0B8x0GnH2o7Td6pGsHQOmvSSXgreNimcjOZTFPPHgisjQ9q1Qxcv6RtU soHMYH8tFD47duExf3h/krBD3THsIiYqKQ+4g= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 2244626b (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60358@debbugs.gnu.org>; Mon, 2 Jan 2023 19:47:43 +0000 (UTC) Message-Id: In-Reply-To: References: From: Vivien Kraus Date: Tue, 27 Dec 2022 17:23:30 +0100 Subject: [PATCH v12 3/4] gnu: Add gnulib. To: 60358@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/build-tools.scm (gnulib-checkout, gnulib): New variables. --- gnu/packages/build-tools.scm | 203 +++++++++++++++++++++++++++++++++++ 1 file changed, 203 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 6c1350c44f..397318e555 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -15,6 +15,7 @@ ;;; [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII but isn't X-Debbugs-Envelope-To: 60358 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: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/build-tools.scm (gnulib-checkout, gnulib): New variables. --- gnu/packages/build-tools.scm | 203 +++++++++++++++++++++++++++++++++++ 1 file changed, 203 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 6c1350c44f..397318e555 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -15,6 +15,7 @@ ;;; [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII but isn't -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/build-tools.scm (gnulib-checkout, gnulib): New variables. --- gnu/packages/build-tools.scm | 203 +++++++++++++++++++++++++++++++++++ 1 file changed, 203 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 6c1350c44f..397318e555 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2021 qblade ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2022 Juliana Sims +;;; Copyright © 2022 Vivien Kraus ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,6 +33,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 +41,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 +75,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 +814,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