From patchwork Fri Mar 8 23:29:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Artyom V. Poptsov" X-Patchwork-Id: 61547 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 E929127BBE2; Fri, 8 Mar 2024 23:31:58 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 A0FBB27BBE9 for ; Fri, 8 Mar 2024 23:31:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rijgb-0003ot-9q; Fri, 08 Mar 2024 18:31:33 -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 1rijgZ-0003og-9f for guix-patches@gnu.org; Fri, 08 Mar 2024 18:31:31 -0500 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 1rijgZ-0006hg-1x for guix-patches@gnu.org; Fri, 08 Mar 2024 18:31:31 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rijh4-0005W9-1I; Fri, 08 Mar 2024 18:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69443] [PATCH] gnu: guile-gsl: Fix build. References: <877ciptsq4.fsf@aartaka.me> In-Reply-To: <877ciptsq4.fsf@aartaka.me> Resent-From: "Artyom V. Poptsov" 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: Fri, 08 Mar 2024 23:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69443 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69443@debbugs.gnu.org Cc: "Artyom V. Poptsov" , mail@aartaka.me, glv@posteo.net, cox.katherine.e+guix@gmail.com, me@bonfacemunyoki.com, sharlatanus@gmail.com, jgart@dismail.de X-Debbugs-Original-Xcc: glv@posteo.net, cox.katherine.e+guix@gmail.com, me@bonfacemunyoki.com, sharlatanus@gmail.com, jgart@dismail.de Received: via spool by 69443-submit@debbugs.gnu.org id=B69443.170994071921201 (code B ref 69443); Fri, 08 Mar 2024 23:32:01 +0000 Received: (at 69443) by debbugs.gnu.org; 8 Mar 2024 23:31:59 +0000 Received: from localhost ([127.0.0.1]:59958 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rijh1-0005Vs-23 for submit@debbugs.gnu.org; Fri, 08 Mar 2024 18:31:59 -0500 Received: from mail-lf1-f49.google.com ([209.85.167.49]:52442) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rijgv-0005Va-W7 for 69443@debbugs.gnu.org; Fri, 08 Mar 2024 18:31:57 -0500 Received: by mail-lf1-f49.google.com with SMTP id 2adb3069b0e04-51381021af1so1865547e87.0 for <69443@debbugs.gnu.org>; Fri, 08 Mar 2024 15:31:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709940615; x=1710545415; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=KTFu6MZQPgRGhhghse7ElNjm+JBwDJBuK2IOpa16kBo=; b=XyNqfawpJtHwthZ/+47vp8oI2Q2kzGj7wiJIUB7iczo36MOdX40Bqyf0LoVbvVyp9J Vwe2UaxdYb+ooNAQ1vUTKNQeU4uNdmGGeoqZXS6WN/EPapq4w0TeCXhONc6xJ/7rVEXO SqUHGALEbqd+AIcEzbiso21a1f9eZBc2SbdD/Oy5g6YkJnHlsIX0pF6cOPuiid0Yt/51 3ZYxs9cv85rHjTPbLR9RxToj2P+MyG1oc4gJS6Rp9iPQXHPSzZ+dMbojhgNkyeePc5iF OYU55pMNm+kELXSNN6ZTdPWrSoBjUvDf7c5FXGaUUYcfMSmH5+a6XE0Dwu7o71oVin34 /DiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709940615; x=1710545415; 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=KTFu6MZQPgRGhhghse7ElNjm+JBwDJBuK2IOpa16kBo=; b=hL+mgfEKHm3Mar4O833qTVGmtCFv1pEveoc1gwRHLv7iasKXcJHsq/lACKA3odoZyv QEe5e5/Vd4CE7DCgjm3ge9O9KmEcAt2xNHlfKEW9z9I1l7uHhLB8WDIg5fGF5jhtd2Lr 1sbb8aWDT1p1nP5ZUHaa5GNglsTnV0iHfXQ67y+S991skfpCHP6bucrwhNCBIJJb2+tq zLTRYkjW/h3eInPpns8iRJXgC4+sccC8s8ivnLqy1aPStgW98F7KfCb5edCBJvbq8JpJ AX0huY95Tzd3RRNE/evo0jaoouPVXiQ+bNbph7Z1SFNwAx7/UQcnYbO5IVvmqKuzUYzd KS7Q== X-Gm-Message-State: AOJu0YwDrf/4XWRRxankIOW9AgWXOlRWnJklXCyOdWoKoF5wCJjxvJQf 6CRQzyL24KlrSoOrlOrc1VHZN11RG1T5clcGla0oAfNMSTji40dOXGOpYbGU X-Google-Smtp-Source: AGHT+IHhQBxNV3JCTExZBFcArctBYB0IZIbcfuUwhdqIfeHO7Fc97LexhlO8wi3m5sfiSQ6QT9oYxA== X-Received: by 2002:a05:6512:48ca:b0:513:6917:ae8e with SMTP id er10-20020a05651248ca00b005136917ae8emr257435lfb.37.1709940614891; Fri, 08 Mar 2024 15:30:14 -0800 (PST) Received: from elephant.. ([5.164.220.172]) by smtp.gmail.com with ESMTPSA id h23-20020a056512055700b005131ec01b6dsm97992lfl.246.2024.03.08.15.30.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Mar 2024 15:30:14 -0800 (PST) From: "Artyom V. Poptsov" Date: Sat, 9 Mar 2024 02:29:41 +0300 Message-ID: <04ce2de3be93a1a06345350f46b29b159c3ef6a3.1709940581.git.poptsov.artyom@gmail.com> X-Mailer: git-send-email 2.41.0 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/guile-xyz.scm (guile-gsl): Fix build. Change-Id: Iaf653f25fd2b972e575d9c2fd1607cd490cc17db --- gnu/packages/guile-xyz.scm | 86 ++++++++++++++++++++++++++++---------- 1 file changed, 65 insertions(+), 21 deletions(-) base-commit: 38a00bc089205818a351c363a107b8ba5c99fd0d diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 9ddcc626fe..1f9d1ecb3e 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -4522,31 +4522,75 @@ (define-public guile-gsl (package (name "guile-gsl") (version "0.0.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/aartaka/guile-gsl") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "00dy33ibvfhzs5xp65g4g8d02wy4fiamjbp3pg87cghg41q4lwkr")))) - (build-system guile-build-system) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/aartaka/guile-gsl") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00dy33ibvfhzs5xp65g4g8d02wy4fiamjbp3pg87cghg41q4lwkr")))) + (build-system gnu-build-system) (arguments - '(#:source-directory "modules" - #:phases - #~(modify-phases %standard-phases - (add-before 'build 'substitute-gsl-so - (lambda _ - (let ((gsl (string-append #$(this-package-input "lmdb") - "/lib/libgsl.so"))) - (substitute* "modules/gsl/core.scm" - (("libgsl.so") gsl)))))))) + (list + #:modules `(((guix build guile-build-system) + #:select (target-guile-effective-version)) + ,@%gnu-build-system-modules) + #:imported-modules `((guix build guile-build-system) + ,@%gnu-build-system-modules) + #:phases #~(modify-phases %standard-phases + (add-before 'build 'substitute-gsl-so + (lambda _ + (let ((gsl (string-append #$(this-package-input "gsl") + "/lib/libgsl.so"))) + (substitute* "modules/gsl/core.scm" + (("libgsl.so") + gsl))))) + (delete 'configure) + (replace 'build + (lambda* (#:key inputs #:allow-other-keys) + (setenv "CC" "gcc") + (setenv "GUILE_AUTO_COMPILE" "0") + (invoke "make") + (setenv "LD_LIBRARY_PATH" "./") + (let* ((module-dir "modules") + (prefix (string-length module-dir))) + (for-each (lambda (file) + (let* ((base (string-drop (string-drop-right + file 4) + prefix)) + (go (string-append "go" base + ".go"))) + (invoke "guild" + "compile" + "-L" + module-dir + file + "-o" + go))) + (find-files module-dir "\\.scm$"))))) + (delete 'check) ;no tests + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((lib (string-append #$output "/lib")) + (guile #$(this-package-input "guile")) + (version (target-guile-effective-version guile)) + (scm (string-append "/share/guile/site/" + version)) + (go (string-append "/lib/guile/" version + "/site-ccache"))) + (install-file "libguilegslblas.so" lib) + (copy-recursively "modules/" + (string-append #$output scm)) + (copy-recursively "go/" + (string-append #$output go)))))))) (native-inputs (list guile-3.0)) (inputs (list guile-3.0 gsl)) (home-page "https://github.com/aartaka/guile-gsl") - (synopsis "Bindings for GNU Scientific library in Guile.") - (description "This package provides Guile Scheme wrapper for libgsl.so. + (synopsis "Bindings for GNU Scientific library in Guile") + (description + "This package provides Guile Scheme wrapper for @code{libgsl.so}. Only vector, matrix, and BLAS operations are covered for now.") (license license:gpl3+))))