From patchwork Mon Jan 16 05:13:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46188 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A5F4327BBEB; Mon, 16 Jan 2023 06:10:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 86A3D27BBE9 for ; Mon, 16 Jan 2023 06:10:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHIgj-0004jH-TX; Mon, 16 Jan 2023 01:09:45 -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 1pHIgi-0004iN-3V for guix-patches@gnu.org; Mon, 16 Jan 2023 01:09:44 -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 1pHIgh-0008WI-RK for guix-patches@gnu.org; Mon, 16 Jan 2023 01:09:43 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pHHpm-0004gQ-6M for guix-patches@gnu.org; Mon, 16 Jan 2023 00:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60849] [PATCH core-updates 1/4] gnu: libtommath: Update to 1.2.0-0.03de03d. References: <20230116050942.26300-1-maxim.cournoyer@gmail.com> In-Reply-To: <20230116050942.26300-1-maxim.cournoyer@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Jan 2023 05:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60849 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60849@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 60849-submit@debbugs.gnu.org id=B60849.167384606617902 (code B ref 60849); Mon, 16 Jan 2023 05:15:02 +0000 Received: (at 60849) by debbugs.gnu.org; 16 Jan 2023 05:14:26 +0000 Received: from localhost ([127.0.0.1]:60164 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHHpB-0004eY-If for submit@debbugs.gnu.org; Mon, 16 Jan 2023 00:14:26 -0500 Received: from mail-qt1-f172.google.com ([209.85.160.172]:42868) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHHp9-0004eA-FW for 60849@debbugs.gnu.org; Mon, 16 Jan 2023 00:14:24 -0500 Received: by mail-qt1-f172.google.com with SMTP id fd15so13924865qtb.9 for <60849@debbugs.gnu.org>; Sun, 15 Jan 2023 21:14:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=p30WJ+AUsGGNrT8p61tmCLktKfFImWqPczcUNBfPNzI=; b=LtRhv5xxiv9RJHQWDwYZwZcRixo2mvFcfnxnJLCgu18W37VY8WlpYk4JtHhSjoD+NK bPQ5VOnrpE8NaYR+Sz2226fX3vI5scAEmpx4WKVLox8fsiI/6Xk6X7ayJUxKHwRBTSMF efV3kUEapUrhXJLtKebFn7bXzuCcLkM2FQQHVtXAnNHIc7PMtTOoZPTWvUmsBJ2PbEOb j1P+QZrM/lD3Jq7vi4MCn6V8+vov4mBan+AAPcy2ex1xznCzaoIjMyUaYHcK2a1HkQhs zkwTK5H9ZsSgMdDqAfN/S2aVoE4yyBVWaF3z9z4hA/IUnAkYZajTgWMWWFU+u2IUf2Ln gXpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=p30WJ+AUsGGNrT8p61tmCLktKfFImWqPczcUNBfPNzI=; b=VYGX6G0fPOOaut8HllGnPs5g2u1ErBPODaVYILl/7HyHGJEQUfdjwke8QpNgxgc0CO sDJQKl402n320RPb84UXlDm5ufZJS1YMCgVUPQxA7wvvRup8GmaOoXMW/cE9ZQe9T2Tt B0fhy7E+XiyT2FAHmg4XJ9pfN12YLlEIf27BV8giJDwEbEAOYF5VqyjpibV/+2RRFZ6B nXwHYqr8yCTaXRFlyOjdJvn4ISuoLXui5a5tW7ycRKkOHgUBdwd7q0dm46aMM+8Yf6Jr ogMcZvKxW0rrOP4t0vEuCFa+0ZWzQEZv72o6mlyVYrC97vd+ps/+uI8h0ZN1AsubFLMd 0PlA== X-Gm-Message-State: AFqh2koNVifl23UDJVh05Xh6D1oRsXSm+IT8dMu6T/41Rr932W4Sh5o8 4fV4J+hg4xMsLM7CKCWCcfJNJyInFudHYY1w X-Google-Smtp-Source: AMrXdXv2bKpJoqJ712S14ohuO9ZyJytogNMjEW/RqRNrbEClAxRRo/Nyh1uTwAehm6RiVmEQqe7RGA== X-Received: by 2002:a05:622a:618b:b0:3ac:833b:e5b6 with SMTP id hh11-20020a05622a618b00b003ac833be5b6mr38506823qtb.21.1673846057766; Sun, 15 Jan 2023 21:14:17 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id em8-20020a05622a438800b003a82ca4e81csm8084590qtb.80.2023.01.15.21.14.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 21:14:17 -0800 (PST) From: Maxim Cournoyer Date: Mon, 16 Jan 2023 00:13:36 -0500 Message-Id: <20230116051339.27113-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This change makes it possible to cross-compile libtommath. * gnu/packages/multiprecision.scm (libtommath): Update to 1.2.0-0.03de03d. [outputs]: Delete field. [source]: Fetch from git. [build-system]: Switch to cmake-build-system. [arguments]: Delete prepare-build, remove-static-library, check and install-static-library phases. Delete #:test-target and #:make-flags arguments. Add #:configure-flags argument. [native-inputs]: Delete field. --- gnu/packages/multiprecision.scm | 73 +++++++++++---------------------- 1 file changed, 25 insertions(+), 48 deletions(-) diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index b96efed843..c8b4639ed7 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2018 Eric Bavier ;;; Copyright © 2018, 2019, 2021 Efraim Flashner ;;; Copyright © 2021 Vinicius Monego -;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2022, 2023 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,6 +39,7 @@ (define-module (gnu packages multiprecision) #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu)) (define-public gmp @@ -439,56 +440,32 @@ (define-public libtomcrypt (license unlicense))) (define-public libtommath - (package - (name "libtommath") - (version "1.2.0") - (outputs '("out" "static")) - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/libtom/libtommath/releases/" - "download/v" version "/ltm-" version ".tar.xz")) - (sha256 - (base32 - "1c8q1qy88cjhdjlk3g24mra94h34c1ldvkjz0n2988c0yvn5xixp")))) - (build-system gnu-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (delete 'configure) ; no configure - (add-after 'unpack 'prepare-build - (lambda _ - ;; We want the shared library by default so force it to be the - ;; default makefile target. - (delete-file "makefile") - (symlink "makefile.shared" "makefile") - #t)) - (add-after 'install 'remove-static-library - (lambda* (#:key outputs #:allow-other-keys) - (delete-file (string-append (assoc-ref outputs "out") - "/lib/libtommath.a")) - #t)) - (replace 'check - (lambda* (#:key test-target make-flags #:allow-other-keys) - (apply invoke "make" test-target make-flags) - (invoke "sh" "test"))) - (add-after 'install 'install-static-library - (lambda* (#:key outputs #:allow-other-keys) - (invoke "make" "-f" "makefile.unix" "install" - (string-append "PREFIX=" (assoc-ref outputs "static")) - (string-append "CC=" (which "gcc")))))) - #:test-target "test" - #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) - "CC=gcc"))) - (native-inputs - (list libtool)) - (home-page "https://www.libtom.net/LibTomMath/") - (synopsis "Portable number theoretic multiple-precision integer library") - (description "LibTomMath is a portable number theoretic multiple-precision + ;; Use the latest commit, as it contains a new CMake build system capable of + ;; cross-compilation. + (let ((revision "0") + (commit "03de03dee753442d4b23166982514639c4ccbc39")) + (package + (name "libtommath") + (version (git-version "1.2.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libtom/libtommath") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0maqzpc3f4l9b3bps8dj49b3schj3dfzvf2xcpilg8q3p1sxgrbl")))) + (build-system cmake-build-system) + (arguments (list #:configure-flags #~(list "-DBUILD_TESTING=ON" + "-DBUILD_SHARED_LIBS=ON"))) + (home-page "https://www.libtom.net/LibTomMath/") + (synopsis "Portable number theoretic multiple-precision integer library") + (description "LibTomMath is a portable number theoretic multiple-precision integer library written entirely in C. It's designed to provide an API that is simple to work with that provides fairly efficient routines that build out of the box without configuration.") - (license unlicense))) + (license unlicense)))) (define-public libtommath-1.1 (package From patchwork Mon Jan 16 05:13:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46187 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4E98F27BBE9; Mon, 16 Jan 2023 06:10:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 462B027BBEB for ; Mon, 16 Jan 2023 06:10:05 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHIgi-0004j1-VO; Mon, 16 Jan 2023 01:09:44 -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 1pHIgh-0004iI-Uu for guix-patches@gnu.org; Mon, 16 Jan 2023 01:09:43 -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 1pHIgh-0008W8-KT for guix-patches@gnu.org; Mon, 16 Jan 2023 01:09:43 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pHHpm-0004iH-J9 for guix-patches@gnu.org; Mon, 16 Jan 2023 00:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60849] [PATCH core-updates 2/4] gnu: libtomcrypt: Update to 1.18.2-0.29986d0. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Jan 2023 05:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60849 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60849@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 60849-submit@debbugs.gnu.org id=B60849.167384606917913 (code B ref 60849); Mon, 16 Jan 2023 05:15:02 +0000 Received: (at 60849) by debbugs.gnu.org; 16 Jan 2023 05:14:29 +0000 Received: from localhost ([127.0.0.1]:60168 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHHpE-0004er-Mo for submit@debbugs.gnu.org; Mon, 16 Jan 2023 00:14:29 -0500 Received: from mail-qt1-f169.google.com ([209.85.160.169]:36630) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHHpA-0004eE-L1 for 60849@debbugs.gnu.org; Mon, 16 Jan 2023 00:14:25 -0500 Received: by mail-qt1-f169.google.com with SMTP id x5so256192qti.3 for <60849@debbugs.gnu.org>; Sun, 15 Jan 2023 21:14:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=sGFpH92DfajF9VzUNmTjNiF6+DLgBRCJAdWPA4itJvE=; b=KJDhiwsNgBycJxtLuOALAF318VxfrFOk/swIHZsKGL3D0dmJRlw38nntIQL4Qkb4uW q/ZuwaOf3q8NYGjpjHT6yQ7S37XGwLUiiUr+xZfyGS709aSpyDx6h6hxDZNwvdjxIU4M gURS1dU48K2M3hKGyOSrLObabOLjXSwBIOJUjV2Mq4Wl7TfF+kcAwlFz1T9qA7st26RQ k3Is0tF/V3w0M4PnIzPT7j7Nk6n48Hnp/2M7Bd4IVott/ZmSq0/s9atl8/VMszacXfQy IjKAAI7T/Lfccfun8EgUxtRLbU90qmkUgpgTcoINIXZvxOeyUCNiLEpBVDF6crBiDuMG 8o8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=sGFpH92DfajF9VzUNmTjNiF6+DLgBRCJAdWPA4itJvE=; b=kJPfPf505OC01Cink/W2b8Wp5Cz3KW9j9bQ0oqOdOYRGCtxdFFQShIPMp4XVYw5NX+ A2BaB3clfL5EMB9MPGbuvNIgtxtaKQwMhdvM+Qgp0IUMPuRL1vW/PjaiJuWNo63XGvkU WEOkOtaakA7YxzHINVU/qV/BM437QxXeXjlc9mJcKpn1SVNhzDsoc4xm1NN/18NiDm8z 7ZIIm2V3DvZemEpxY07FbDt2ZcLc3Vyg5GRrRkf8JxXOIt9SONQfYOAfYdbk8mau2hpc sOlx3n4smBrZq170k3s/qQ7njlfhrrQx8OUvWeOEFai6dXC4TIxmEeyg0csV3OJ4akJa nsbQ== X-Gm-Message-State: AFqh2kpMxJjYw+mEAn9lZKcXiCnIC2PGHWH7W5RpHS8bITU2t+Aw7e0A ylx2vZKZDs6vzegj0DzTYdtXNRoFLbveDq1I X-Google-Smtp-Source: AMrXdXtyIxQb1jWCWv21FK9tbgnnd9lei0uk/F1cWPN2ubbSvcJ6lOwzBtzOJbSNFNH/q3ykQVQCfA== X-Received: by 2002:a05:622a:4c16:b0:3b6:2d75:9b07 with SMTP id ey22-20020a05622a4c1600b003b62d759b07mr7431841qtb.26.1673846059033; Sun, 15 Jan 2023 21:14:19 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id em8-20020a05622a438800b003a82ca4e81csm8084590qtb.80.2023.01.15.21.14.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 21:14:18 -0800 (PST) From: Maxim Cournoyer Date: Mon, 16 Jan 2023 00:13:37 -0500 Message-Id: <20230116051339.27113-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116051339.27113-2-maxim.cournoyer@gmail.com> References: <20230116051339.27113-2-maxim.cournoyer@gmail.com> MIME-Version: 1.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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This change makes it possible to cross-compile libtomcrypt. * gnu/packages/multiprecision.scm (libtomcrypt): Update to 1.18.2-0.29986d0. [outputs]: Delete field. [source]: Fetch from git. Delete snippet and modules field. [build-system]: Switch to cmake-build-system. [phases]: Delete all phase. Add patch-libtomcrypt.pc.in phase. [native-inputs]: Delete field. --- gnu/packages/multiprecision.scm | 106 +++++++++++--------------------- 1 file changed, 35 insertions(+), 71 deletions(-) diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index c8b4639ed7..6acf22c6d6 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -364,80 +364,44 @@ (define-public tomsfastmath (license public-domain))) (define-public libtomcrypt - (package - (name "libtomcrypt") - (version "1.18.2") - (outputs '("out" "static")) - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/libtom/libtomcrypt" - "/releases/download/v" version - "/crypt-" version ".tar.xz")) - (sha256 - (base32 - "113vfrgapyv72lalhd3nkw7jnks8az0gcb5wqn9hj19nhcxlrbcn")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Patch CVE-2019-17362 - ;; https://github.com/libtom/libtomcrypt/commit/25c26a3b7a9ad8192ccc923e15cf62bf0108ef94 - (substitute* "src/pk/asn1/der/utf8/der_decode_utf8_string.c" - (("z > 4") "z == 1 || z > 4")) - #t)))) - (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'configure) ; no configure - (add-after 'unpack 'prepare-build - (lambda _ - ;; We want the shared library by default so force it to be the - ;; default makefile target. - (delete-file "makefile") - (symlink "makefile.shared" "makefile") - ;; We link to libtommath, so we need to add it to the pc file - (substitute* "libtomcrypt.pc.in" - (("-ltomcrypt") "-ltomcrypt -ltommath")) - #t)) - (add-after 'build 'build-static - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "-f" "makefile.unix" make-flags))) - (replace 'check - (lambda* (#:key test-target make-flags #:allow-other-keys) - (apply invoke "make" "-f" "makefile.unix" test-target make-flags) - (invoke "./test"))) - (add-after 'install 'install-static-library - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (static (assoc-ref outputs "static"))) - (mkdir-p (string-append static "/lib")) - (mkdir-p (string-append static "/include")) - (rename-file (string-append out "/lib/libtomcrypt.a") - (string-append static "/lib/libtomcrypt.a")) - (copy-recursively (string-append out "/include") - (string-append static "/include")) - #t)))) - #:test-target "test" - #:make-flags - (list (string-append "PREFIX=" (assoc-ref %outputs "out")) - "CFLAGS += -DLTM_DESC -DUSE_LTM" - (string-append "EXTRALIBS=" - (search-input-file %build-inputs - "/lib/libtommath.so")) - (string-append "CC=" ,(cc-for-target))))) - (native-inputs - (list libtool)) - (inputs - (list libtommath)) - (home-page "https://www.libtom.net/LibTomCrypt/") - (synopsis "Cryptographic toolkit") - (description "LibTomCrypt is a fairly comprehensive, modular and portable + ;; Use the latest commit, as it contains a new CMake build system capable of + ;; cross-compilation. + (let ((revision "0") + (commit "29986d04f2dca985ee64fbca1c7431ea3e3422f4")) + (package + (name "libtomcrypt") + (version (git-version "1.18.2" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libtom/libtomcrypt") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "02x0h3lcl2s4zykiqwdccj8cxsbilg0lspxn8r1gmhxc3k9bgk88")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DBUILD_TESTING=ON" + "-DBUILD_SHARED_LIBS=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-libtomcrypt.pc.in + (lambda _ + ;; We link to libtommath, so we need to add it to the pc file + ;; (see: https://github.com/libtom/libtomcrypt/issues/610). + (substitute* "libtomcrypt.pc.in" + (("-ltomcrypt") "-ltomcrypt -ltommath"))))))) + (inputs (list libtommath)) + (home-page "https://www.libtom.net/LibTomCrypt/") + (synopsis "Cryptographic toolkit") + (description "LibTomCrypt is a fairly comprehensive, modular and portable cryptographic toolkit that provides developers with a vast array of well known published block ciphers, one-way hash functions, chaining modes, pseudo-random number generators, public key cryptography and a plethora of other routines.") - (properties `((lint-hidden-cve . ("CVE-2019-17362")))) - (license unlicense))) + (properties `((lint-hidden-cve . ("CVE-2019-17362")))) + (license unlicense)))) (define-public libtommath ;; Use the latest commit, as it contains a new CMake build system capable of From patchwork Mon Jan 16 05:13:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46189 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 640BE27BBED; Mon, 16 Jan 2023 06:10:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EB0D527BBE9 for ; Mon, 16 Jan 2023 06:10:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHIgk-0004jd-6H; Mon, 16 Jan 2023 01:09:46 -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 1pHIgi-0004ii-Ho for guix-patches@gnu.org; Mon, 16 Jan 2023 01:09:44 -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 1pHIgi-00004s-7w for guix-patches@gnu.org; Mon, 16 Jan 2023 01:09:44 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pHHpm-0004jw-VT for guix-patches@gnu.org; Mon, 16 Jan 2023 00:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60849] [PATCH core-updates 3/4] gnu: python-pycryptodome: Fix build and enable cross-compilation. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Jan 2023 05:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60849 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60849@debbugs.gnu.org Cc: jgart , Lars-Dominik Braun , Maxim Cournoyer Received: via spool by 60849-submit@debbugs.gnu.org id=B60849.167384607017922 (code B ref 60849); Mon, 16 Jan 2023 05:15:02 +0000 Received: (at 60849) by debbugs.gnu.org; 16 Jan 2023 05:14:30 +0000 Received: from localhost ([127.0.0.1]:60170 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHHpF-0004ey-Eu for submit@debbugs.gnu.org; Mon, 16 Jan 2023 00:14:29 -0500 Received: from mail-qt1-f169.google.com ([209.85.160.169]:41778) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHHpB-0004eG-Kd for 60849@debbugs.gnu.org; Mon, 16 Jan 2023 00:14:26 -0500 Received: by mail-qt1-f169.google.com with SMTP id d16so10908102qtw.8 for <60849@debbugs.gnu.org>; Sun, 15 Jan 2023 21:14:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=uFgwAeqOV9gRBIea9PHHiYHtDpltqOyl85c+IZOkhXY=; b=QdpE922Vsh1NzpnG2ahxpP0IFw492nEphHLGAUt39j4+76fsjQG//X/3x/ntm9WGrS seE1buvQ0viVGI6jrW7ZrJYGA29MuT2bPDE9HsqqacsIhADDeMhK8vFz+fPWgDwKRPyH Hf5PqkWyK3pkX+67yJdHvPfH1TiYXUdFhrxSN/M0fMzblJGtmuY76VAyiY5L2yWBhJ2R PHmVDH+AmMl88ZDeYTQhpGgsf52q6qakHyDfq7XDBrJDuDPdd4aOpbTK7U15aa0cPL70 sogi3o9ennXJvTrF8RtKGKRz721NoAfvW8ufCOapS6p3uX7DYz23mx5GP8BgnkC4ygCU K5Bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=uFgwAeqOV9gRBIea9PHHiYHtDpltqOyl85c+IZOkhXY=; b=4hPNfyipskCG7yrSUpkqpLfFHuRMCT9s8kZ1SQBg6S2aNGiN9r6ZtsF9YBaLp49maw YDf/EDj2teAJ6q8nsUXGUtkwfie6rp4Lx5Te3QR10kYCRaaAj7pUDl8JGCq4IWrVTqkE kBHA9cL+glqRGpVbWFvwzEZIU0iz20+G3Xu49uz6pUHyiPkBdZC/u7JAInRLd6Uhl7mX err/EyIevav5f2oP3Iik96JJ3lR8+T9dpUJ0zZxQL8rFTuALIZcYf8WwfBuZm7ch5OV9 fur+M4EIdkwYX6uzKlLq72qieAY44i2QEYZrjFpniGE0QFqdNtCNQxmwNKTv+qMeYk+i KbBQ== X-Gm-Message-State: AFqh2kraFn6xaxIbVxmiarS1f//uSgcgXLRAB2ant8FLlZR+/rFH04Db FF3n4xbkrvZrrb7zlAIphCztH/RqeO2Jbwgd X-Google-Smtp-Source: AMrXdXuNcuW4cex1rYqkQubk/yWxHsKepbTvjjzvreK5fEtwriVRtTvi1vfHmT4tQQGYtBCC+d2Q0Q== X-Received: by 2002:ac8:1249:0:b0:3b0:e83e:4331 with SMTP id g9-20020ac81249000000b003b0e83e4331mr26516767qtj.44.1673846060169; Sun, 15 Jan 2023 21:14:20 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id em8-20020a05622a438800b003a82ca4e81csm8084590qtb.80.2023.01.15.21.14.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 21:14:19 -0800 (PST) From: Maxim Cournoyer Date: Mon, 16 Jan 2023 00:13:38 -0500 Message-Id: <20230116051339.27113-4-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116051339.27113-2-maxim.cournoyer@gmail.com> References: <20230116051339.27113-2-maxim.cournoyer@gmail.com> MIME-Version: 1.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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-crypto.scm (python-pycryptodome) [build-system]: Use pyproject-build-system. [arguments]: New field. [inputs]: Re-indent. --- gnu/packages/python-crypto.scm | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index c9071c4cf6..9023a5e054 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1012,9 +1012,23 @@ (define-public python-pycryptodome "1f0qc0ns3ppybkr7wi66gsl5wfkcx1fdklmh3362nn84spddsdci")) (modules '((guix build utils))) (snippet pycryptodome-unbundle-tomcrypt-snippet))) - (build-system python-build-system) - (inputs - (list libtomcrypt libtommath)) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'extend-C_INCLUDE_PATH + (lambda* (#:key inputs target #:allow-other-keys) + (if target + (setenv "CROSS_C_INCLUDE_PATH" + (string-append (search-input-directory + inputs "include/libtomcrypt") + ":" (getenv "CROSS_C_INCLUDE_PATH"))) + (setenv "C_INCLUDE_PATH" + (string-append (search-input-directory + inputs "include/libtomcrypt") + ":" (getenv "C_INCLUDE_PATH"))))))))) + (inputs (list libtomcrypt libtommath)) (home-page "https://www.pycryptodome.org") (synopsis "Low-level cryptographic Python library") (description From patchwork Mon Jan 16 05:13:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46186 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A7FCE27BBED; Mon, 16 Jan 2023 06:10:08 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 43BA327BBE9 for ; Mon, 16 Jan 2023 06:10:05 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHIgi-0004iw-Rs; Mon, 16 Jan 2023 01:09:44 -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 1pHIgh-0004gd-Cn for guix-patches@gnu.org; Mon, 16 Jan 2023 01:09:43 -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 1pHIgh-0008W4-38 for guix-patches@gnu.org; Mon, 16 Jan 2023 01:09:43 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pHHpn-0004le-CY for guix-patches@gnu.org; Mon, 16 Jan 2023 00:15:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60849] [PATCH core-updates 4/4] gnu: python-coverage: Switch to pyproject-build-system. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Jan 2023 05:15:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60849 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60849@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 60849-submit@debbugs.gnu.org id=B60849.167384607417941 (code B ref 60849); Mon, 16 Jan 2023 05:15:03 +0000 Received: (at 60849) by debbugs.gnu.org; 16 Jan 2023 05:14:34 +0000 Received: from localhost ([127.0.0.1]:60172 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHHpJ-0004fI-S3 for submit@debbugs.gnu.org; Mon, 16 Jan 2023 00:14:34 -0500 Received: from mail-qt1-f174.google.com ([209.85.160.174]:39714) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHHpC-0004eI-Vr for 60849@debbugs.gnu.org; Mon, 16 Jan 2023 00:14:29 -0500 Received: by mail-qt1-f174.google.com with SMTP id r15so658871qtx.6 for <60849@debbugs.gnu.org>; Sun, 15 Jan 2023 21:14:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=oAJB7W2p8aqxdGfmCsxsbVShKzXT7uENR3KkytJ20s4=; b=cdiG1YRiWIs+9gt8GzqIJY5m48T271J3C66W21VGXujNncPKyfMmBrMxl8Q7PRiTyq 7hH+lxEK2hJSZcNNt/G9nFpVbP6PzTpHT45NHpXIP3NYTpKLD8fwgetd59krSi6jjaR+ /AEDCjobwjA68b8iuCcaTHzwEOxeVN//TwmlQlr8FuTsNms5uNVTJLBgiy0mspM55vTz 9KY9g3dOnAHb4CmH4IxpUkbD0XISCKLDZSwifkVXx7i2CooA+4M1fO/wl5VehIpetour 95BZaOkLxKOq2V/j9mXfIyDqWAr7kG7+z5s+g6aKIIciIN2UykLJFoS4QvUUHAfVGvca ti4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=oAJB7W2p8aqxdGfmCsxsbVShKzXT7uENR3KkytJ20s4=; b=SsLRxg21+mJ+mXA2plYe+PoATpX9a+84cYa5fxArWotgs8iseYnWp5fxJAm2LHcTab 5k34eDeadYkTxDbl8+j47Cei0BxJb4lnk/47gVCjKp7w5QZBOINAPSClsBiyZR6Kv4NY UhOsAjMKgyG0Xym8fSn70hyamZmNfxRZU5ejTrJSyKamzVTrDJuri5L7fhzzC/UIYu9f JYcIA2lUlWh94yp+nG6BArplEPiNLimEVHyIArCc+9fSq6kYI7iWkXz2lC0OmL973Lf7 kZ+MMALumDh0YUFyDzT7V/BGAVZm7yPINlMgN1cDCAmOhu6SCwg5Y/ZA+v9hd9lYNTw5 12zg== X-Gm-Message-State: AFqh2kqpVYfqUIIdrQKiQSNcaA5FFoxQLbjdVPE/ydNDXuQOG3fQEsBo RzD+M21NWO9wZAyOudN5JkzNANWMArxmyWfy X-Google-Smtp-Source: AMrXdXuKIw1zHjMh95OoTMMpkDwLC6kYVkxFxEfb63bAZsRLn3NLI9z1Ej7zAhuXmiQpBN8xD6BfqA== X-Received: by 2002:a05:622a:20a:b0:3a8:2bf6:85ea with SMTP id b10-20020a05622a020a00b003a82bf685eamr154359133qtx.49.1673846061267; Sun, 15 Jan 2023 21:14:21 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id em8-20020a05622a438800b003a82ca4e81csm8084590qtb.80.2023.01.15.21.14.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 21:14:20 -0800 (PST) From: Maxim Cournoyer Date: Mon, 16 Jan 2023 00:13:39 -0500 Message-Id: <20230116051339.27113-5-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116051339.27113-2-maxim.cournoyer@gmail.com> References: <20230116051339.27113-2-maxim.cournoyer@gmail.com> MIME-Version: 1.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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/check.scm (python-coverage) [build-system]: Use pyproject-build-system. --- gnu/packages/check.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index aaa41777dc..3a6a0687e3 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2004,7 +2004,7 @@ (define-public python-coverage (sha256 (base32 "16z8i18msgs8k74n73dj9x49wzkl0vk4vq8k5pl1bsj70y7b4k53")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments ;; FIXME: 95 tests failed, 539 passed, 6 skipped, 2 errors. '(#:tests? #f))