From patchwork Thu Mar 20 09:09:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: guix-patches--- via X-Patchwork-Id: 40462 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 19DFC27BBEA; Thu, 20 Mar 2025 09:11:52 +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=-6.3 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A 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 08CB627BBE9 for ; Thu, 20 Mar 2025 09:11:50 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tvBvp-0007NQ-Nh; Thu, 20 Mar 2025 05:11:18 -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 1tvBvm-0007Mt-Ut for guix-patches@gnu.org; Thu, 20 Mar 2025 05:11:15 -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 1tvBvm-0001XV-K0 for guix-patches@gnu.org; Thu, 20 Mar 2025 05:11:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=pROgaxdjEOkVUcvxmluEtDSuBjEaBRSRPQF8z+7v5O0=; b=PKSiOypGDz+PgCHKzgwq761kNgNChYC+7FCHome0QZzFXwDL72qg+UJ/Ga2nxFwZviMgA4dTWeF9pV8ZQrtkl86ns4fO0H3jZIZka1F0Dwbr+zRKgz8C/zMYQNyOJO0Gsxc9jU6zfS0qpDaVXv81zuAuPcsPXK1XFtyMMLgZZRVh1JnjmQXKCkhdGkReXyK2JhfDEL0QOuv+ntMQUOVYkCUM1eZz7pYGFYljddogoyJzufGVvjAbpEVhaifC8b45YA1Z3zRb1ksQweW+Uh4O2K6cP/GIHXekSU7KVx6DEyjwRRNLonB3dFyN2yqjdq4IM1Ns78NWjz1LCA3FtKxT3A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tvBva-00085u-1n; Thu, 20 Mar 2025 05:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77130] [PATCH] gnu: clasp-cl: Update to 2.7.0. Resent-From: ashish.is@lostca.se Original-Sender: "Debbugs-submit" Resent-CC: glv@posteo.net, cox.katherine.e+guix@gmail.com, me@bonfacemunyoki.com, sharlatanus@gmail.com, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Thu, 20 Mar 2025 09:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77130 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77130@debbugs.gnu.org Cc: Ashish SHUKLA , Guillaume Le Vaillant , Katherine Cox-Buday , Munyoki Kilyungi , Sharlatan Hellseher , jgart X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Guillaume Le Vaillant , Katherine Cox-Buday , Munyoki Kilyungi , Sharlatan Hellseher , jgart Received: via spool by submit@debbugs.gnu.org id=B.174246184231083 (code B ref -1); Thu, 20 Mar 2025 09:11:01 +0000 Received: (at submit) by debbugs.gnu.org; 20 Mar 2025 09:10:42 +0000 Received: from localhost ([127.0.0.1]:55180 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tvBvA-000855-Bx for submit@debbugs.gnu.org; Thu, 20 Mar 2025 05:10:42 -0400 Received: from lists.gnu.org ([2001:470:142::17]:56140) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tvBv6-00084m-4K for submit@debbugs.gnu.org; Thu, 20 Mar 2025 05:10:34 -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 1tvBuv-0007HX-DH for guix-patches@gnu.org; Thu, 20 Mar 2025 05:10:22 -0400 Received: from anamika.lostca.se ([2a01:4f9:3b:505c::2]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tvBus-0001Ho-G7 for guix-patches@gnu.org; Thu, 20 Mar 2025 05:10:20 -0400 Received: from localhost.localdomain (2a02-9140-3881-0900-9269-7984-f93f-ec5a.red-2a02-914.customerbaf.ipv6.rima-tde.net [IPv6:2a02:9140:3881:900:9269:7984:f93f:ec5a]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: abbe) by anamika.lostca.se (Postfix) with ESMTPSA id 6D44812FAA; Thu, 20 Mar 2025 09:10:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1742461806; h=from:from: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; bh=pROgaxdjEOkVUcvxmluEtDSuBjEaBRSRPQF8z+7v5O0=; b=Cuy3KQj5v7P6gk8WMITKs6NrL+sjBPWtpMM9t/3U5i8e0sIJ1v/H+1X3Hib+FYCtv1T+j5 DTh73p9hPVpzFwweFka+EcdTLdpDookR27UPiDOUwxSnzeDpXQuY0k+YCCcw0Q0vxaKzND xSMUGMoZMb41+YhJ0+VV3BAok445hh0= Date: Thu, 20 Mar 2025 10:09:52 +0100 Message-ID: <6787eaf6ca97b8f93725aceb028d454f7445fd47.1742461792.git.ashish.is@lostca.se> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a01:4f9:3b:505c::2; envelope-from=ashish.is@lostca.se; helo=anamika.lostca.se X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_SBL_A=0.1 autolearn=ham autolearn_force=no X-Spam_action: no action 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: ashish.is@lostca.se X-ACL-Warn: , "ashish.is--- via Guix-patches" X-Patchwork-Original-From: "ashish.is--- via Guix-patches" via From: guix-patches--- via 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 From: Ashish SHUKLA * gnu/packages/lisp.scm (clasp-cl): Update to 2.7.0. [inputs]: Replace clang, and llvm with clang-toolchain. Switch to LLVM 19 as per upstream release notes. [#:phases]: Add fix-sh-paths phase to patch "/bin/sh" references. Add install-lib phase to install libclasp.so file. : Update ld-flags, and pass more arguments. : Enable parallel building. Most of the changes here are derived from upstream[0]. [0] https://raw.githubusercontent.com/clasp-developers/clasp/refs/tags/2.7.0/guix/clasp.scm Change-Id: Id66086e0fe67ed2db62d1a0913b31e3946188519 --- gnu/packages/lisp.scm | 51 +++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 16 deletions(-) base-commit: 18f956467a7e3e35e21a9b5616025bf33f307ad7 diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 1af71bc9a2..b5b5128c55 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -28,7 +28,7 @@ ;;; Copyright © 2023 Andrew Kravchuk ;;; Copyright © 2024 Andreas Enge ;;; Copyright © 2024 bigbug -;;; Copyright © 2024 Ashish SHUKLA +;;; Copyright © 2024, 2025 Ashish SHUKLA ;;; Copyright © 2024 Omar Bassam ;;; Copyright © 2024 Suhail Singh ;;; Copyright © 2024 David Pflug @@ -382,7 +382,7 @@ (define-public ccl (define-public clasp-cl (package (name "clasp-cl") - (version "2.6.0") + (version "2.7.0") (source (origin (method url-fetch) @@ -390,16 +390,24 @@ (define-public clasp-cl "https://github.com/clasp-developers/clasp/releases/download/" version "/clasp-" version ".tar.gz")) (sha256 - (base32 "10jjhcid6qp64gx29iyy5rqqijwy8hrvx66f0xabdj8w3007ky39")))) + (base32 "1sf8m0w3d4kagf4chb7viqndnr152crpsy979ll61krcfxaybc4j")))) (build-system gnu-build-system) (inputs - (list boost clang-15 fmt `(,gcc "lib") gmp libelf libunwind llvm-15)) + (list boost clang-toolchain-19 fmt `(,gcc "lib") gmp libelf libunwind)) (native-inputs (list binutils-gold ninja pkg-config sbcl)) (arguments `(#:phases (modify-phases %standard-phases (delete 'check) + (add-after 'unpack 'fix-sh-paths + (lambda _ + (substitute* '("dependencies/quicklisp-client/asdf.lisp" + "src/lisp/modules/asdf/uiop/run-program.lisp" + "src/lisp/modules/asdf/uiop/launch-program.lisp" + "src/lisp/regression-tests/extensions.lisp") + (("\"/bin/sh\"") + (string-append "\"" (which "sh") "\""))))) (add-after 'unpack 'patch-koga (lambda* _ (call-with-port (open-file "src/koga/units.lisp" "a") @@ -415,15 +423,16 @@ (define-public clasp-cl "/__fasls")))) (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (clang (assoc-ref inputs "clang")) - (ld-flags - (string-join - (apply append - (map (lambda (f) - (list "-L" f "-rpath" f)) - (string-split (getenv "LIBRARY_PATH") #\:))) - ","))) + (let* ((out (assoc-ref outputs "out")) + (clang (assoc-ref inputs "clang-toolchain")) + (ld-flags (string-join + (apply append + (map (lambda (f) + (list "-L" f "-rpath" f)) + ;; prepend self in rpaths + (cons (string-append out "/lib") + (string-split (getenv "LIBRARY_PATH") #\:)))) + ","))) (invoke "sbcl" "--script" "./koga" @@ -436,13 +445,23 @@ (define-public clasp-cl "--package-path=/" (string-append "--bin-path=" out "/bin") (string-append "--lib-path=" out "/lib/clasp") + (string-append "--dylib-path=" out "/lib") + (string-append "--pkgconfig-path=" out "/lib/pkgconfig") (string-append "--share-path=" out "/share/clasp"))))) (replace 'build - (lambda* _ - (invoke "ninja" "-C" "build"))) + (lambda* (#:key parallel-build? #:allow-other-keys) + (let ((jobs (if parallel-build? + (number->string (parallel-job-count)) + "1"))) + (setenv "CLASP_BUILD_JOBS" jobs) + (invoke "ninja" "-C" "build" "-j" jobs)))) (replace 'install (lambda* _ - (invoke "ninja" "-C" "build" "install")))))) + (invoke "ninja" "-C" "build" "install"))) + (add-after 'install 'install-lib + (lambda* (#:key outputs #:allow-other-keys) + (install-file "build/boehmprecise/lib/libclasp.so" + (string-append (assoc-ref outputs "out") "/lib"))))))) (home-page "https://clasp-developers.github.io/") (synopsis "Common Lisp implementation based on LLVM and C++") (description "Clasp is a new Common Lisp implementation that seamlessly