From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id UPdnHm4wi2TG6AAASxT56A (envelope-from ) for ; Thu, 15 Jun 2023 17:38:22 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id eD19HW4wi2R+kgAAG6o9tA (envelope-from ) for ; Thu, 15 Jun 2023 17:38:22 +0200 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 40F319B98 for ; Thu, 15 Jun 2023 17:38:22 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=jUMhMwNh; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1686843502; a=rsa-sha256; cv=none; b=JqmmgOKROn0Y/e8qurJS9xJ+9EdVOV6+c73SVEyOF8k06NOMwYUPiT4IwYvIUZ50Hm8q9v o9zFiTTWu3VZnmltED4NZ9F9lGf0kGm/7eKZLpB8LeZPSri5Kvc9jp1MLBCAz0Xn4qUFl1 xUHfmVfTQ6vdkYFlG0exv0JYplnoHdcqDbXLagCghMx5LdZcMgXkFj5tbtZSKKFCrU8VI0 qt3czfHUJetmAJ9//M/9s+yP+OiHZnkbR7R1QNnzC8zNzMACkzHq/aWc66vz1eX1YLN5Lo Nzm+FR8p4yii23TCaIvr/9IZNega5Cf7o6RQtLY5yfa3kVOcFgWhQpK0oZ7ajg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=jUMhMwNh; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1686843502; h=from:from:sender:sender: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:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=55rUhg5ZhGV1/4L7Yfk0yhKPeJrVPvnxkFS4j3KRfrQ=; b=FfHOswZFilPcaxnKyuEn9kNRZtGXY0nY+tCkuRsmNteur9GwbB31OYiLvU8WY5itD7nBpr MQAphcinu/eRYSRlEJO4F6NynjnycHMiyicnWdBPh8pN7JvA7pymSORmMp52ydaPz5zkH9 /CDPkk7COSlX0tbRL4oUDWdyxkbGL2sFGDf7i6xNRxc9g6Lznc9yr4g0AY19XBvSRLgjDt oJhulvi0Fn25Ir8JQggRxBcaznxktfjC8qhRx9gXOGPoGG+pR5KnH89Hot5FkGZfkJj1c1 RfMdpqzvxM7TjEhFfm+jgTED9sE21QPUd4PQ3EJ8uzRwzzPbbSL776FegM9ZIg== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q9p2z-0001Ip-MD; Thu, 15 Jun 2023 11:38:05 -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 1q9p2x-0001IM-Nb for guix-patches@gnu.org; Thu, 15 Jun 2023 11:38:03 -0400 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 1q9p2x-0005L1-FA for guix-patches@gnu.org; Thu, 15 Jun 2023 11:38:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q9p2w-0008JD-3M; Thu, 15 Jun 2023 11:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64081] [PATCH 1/2] gnu: fenics: Make sure 'jit.py' can find 'dolfin.pc'. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: yann.dupont@univ-nantes.fr, guix-patches@gnu.org Resent-Date: Thu, 15 Jun 2023 15:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64081 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64081@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Yann Dupont X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Yann Dupont Received: via spool by submit@debbugs.gnu.org id=B.168684347431924 (code B ref -1); Thu, 15 Jun 2023 15:38:01 +0000 Received: (at submit) by debbugs.gnu.org; 15 Jun 2023 15:37:54 +0000 Received: from localhost ([127.0.0.1]:47552 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9p2o-0008Iq-2g for submit@debbugs.gnu.org; Thu, 15 Jun 2023 11:37:54 -0400 Received: from lists.gnu.org ([209.51.188.17]:35734) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9p2l-0008Ih-1X for submit@debbugs.gnu.org; Thu, 15 Jun 2023 11:37:52 -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 1q9p2j-0001DH-Pi for guix-patches@gnu.org; Thu, 15 Jun 2023 11:37:50 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q9p2i-00058V-Ls; Thu, 15 Jun 2023 11:37:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=55rUhg5ZhGV1/4L7Yfk0yhKPeJrVPvnxkFS4j3KRfrQ=; b=jUMhMwNhU+vvsW oC5vKHY0jcQgd+lbfH+Y4qmp7aH6inbQ/zBOCgB4GivhAN6zqAKPSSj1vkcOVgqi4A4lTUxkeedSl aLFlXqOaFKVDS7Y8r4MX5ABWMvfGEet/KKecWtaYEmIsTqQtj2UOQx9MhSS1C+0UTrVsGvYldb9U6 oJk2AOWgZxCXqLetRUJE09kDQUJt4aLhUFkPsJRl0BjPEYOnTWo+14M+8X4ieFhwyAtBQTOOqTsg0 vjPz90P7MgvCodwPWXGNtkLP8HblnpkVsIx/2wnOyEzipq/0nxcPXaw6IOQoefWN4Ghbiubnipeav ThY609A6PZuLrzOWF7Yg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q9p2i-0003rr-9C; Thu, 15 Jun 2023 11:37:48 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Thu, 15 Jun 2023 17:35:30 +0200 Message-Id: <9c787f4f582e4cfebd4349b15a3e88fe253627b9.1686843252.git.ludo@gnu.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -3.13 X-Migadu-Queue-Id: 40F319B98 X-Spam-Score: -3.13 X-TUID: t8xS9yvdRLeA From: Ludovic Courtès * gnu/packages/simulation.scm (fenics)[inputs]: Move PYTHON-PKGCONFIG to... [propagated-inputs]: ... here. [arguments]: Add 'set-dolfin-pc-file-name' phase. --- gnu/packages/simulation.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 059be5a2be..9eeb57babe 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -716,12 +716,14 @@ (define-public fenics ("ply" ,python-ply) ("pytest" ,python-pytest) ("python-decorator" ,python-decorator) - ("python-pkgconfig" ,python-pkgconfig) ,@(package-native-inputs fenics-dolfin))) (propagated-inputs `(("dolfin" ,fenics-dolfin) ("petsc4py" ,python-petsc4py) - ("slepc4py" ,python-slepc4py))) + ("slepc4py" ,python-slepc4py) + + ;; 'dolfin/jit/jit.py' parses 'dolfin.pc' at run time. + ("python-pkgconfig" ,python-pkgconfig))) (arguments `(#:phases (modify-phases %standard-phases @@ -729,6 +731,15 @@ (define-public fenics (lambda _ (substitute* "python/setup.py" (("pybind11==") "pybind11>=")))) + (add-after 'unpack 'set-dolfin-pc-file-name + (lambda* (#:key inputs #:allow-other-keys) + ;; Instead of cluttering the user's 'PKG_CONFIG_PATH' environment + ;; variable, hard-code the 'dolfin.pc' absolute file name. + (let ((pc-file (search-input-file inputs + "/lib/pkgconfig/dolfin.pc"))) + (substitute* "python/dolfin/jit/jit.py" + (("pkgconfig\\.parse\\(\"dolfin\"\\)") + (string-append "pkgconfig.parse(\"" pc-file "\")")))))) (add-after 'patch-source-shebangs 'set-paths (lambda _ ;; Define paths to store locations. base-commit: 26602f4063a6e0c626e8deb3423166bcd0abeb90 -- 2.40.1