From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id aKQ7KyWs8WC/RQEAgWs5BA (envelope-from ) for ; Fri, 16 Jul 2021 17:56:21 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id iEryJiWs8WBLXAAA1q6Kng (envelope-from ) for ; Fri, 16 Jul 2021 15:56:21 +0000 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 379002BAD6 for ; Fri, 16 Jul 2021 17:56:21 +0200 (CEST) Received: from localhost ([::1]:37376 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m4QCK-0003pC-96 for larch@yhetil.org; Fri, 16 Jul 2021 11:56:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41324) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m4QC3-0003oJ-CZ for guix-patches@gnu.org; Fri, 16 Jul 2021 11:56:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40625) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m4QC3-0006aB-5N for guix-patches@gnu.org; Fri, 16 Jul 2021 11:56:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m4QC3-00035a-5m for guix-patches@gnu.org; Fri, 16 Jul 2021 11:56:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49597] [PATCH core-updates 08/15] gnu: Use 'search-input-directory' for the Eigen header directory. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Jul 2021 15:56:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49597 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49597@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 49597-submit@debbugs.gnu.org id=B49597.162645094811793 (code B ref 49597); Fri, 16 Jul 2021 15:56:03 +0000 Received: (at 49597) by debbugs.gnu.org; 16 Jul 2021 15:55:48 +0000 Received: from localhost ([127.0.0.1]:52158 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4QBo-000349-BC for submit@debbugs.gnu.org; Fri, 16 Jul 2021 11:55:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43412) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4QBl-00033h-NI for 49597@debbugs.gnu.org; Fri, 16 Jul 2021 11:55:45 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33754) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m4QBg-0006GI-EK; Fri, 16 Jul 2021 11:55:40 -0400 Received: from vpn-0-27.aquilenet.fr ([2a0c:e300:4:27::]:38216 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m4QBe-0004IN-TQ; Fri, 16 Jul 2021 11:55:39 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Fri, 16 Jul 2021 17:54:13 +0200 Message-Id: <20210716155420.32447-8-ludo@gnu.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210716155420.32447-1-ludo@gnu.org> References: <20210716155420.32447-1-ludo@gnu.org> MIME-Version: 1.0 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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1626450981; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=Cz8XxM21YdNGZSn265G1CEwrGiSA8F+1oZemZN0jD70=; b=H7gCBgW7B0RVmPsjR1XpD1yabRhSpZdZnz0FCN5QzjH4ZpUxW8S9Eg0pkMQqARDxWYnPnI 8tB/VVsizYgTzUE14idte1sAl7ZmmGRjFMoArLB8IA22vNHB0Aa5KlaQax1s8TDksmExrM FOC/zbdfXzTPcUJtSwH1aY0GsCvsRAdFn5hfxdLO5bGgowRsBTfZR1q2flJgRZHrBfWS/z tBrIhXlj6zFQSePANRSbWvrpIUJV8cxmYn9x+QL+hb6MDkBFsUG74uav4TN1i/2xcqPfHJ uR/wYyKJFnUFtEKKFmvY9A8Wj0LOF1lODt5rsBz5Zwhc8aWebWIS3we9WiCjMw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626450981; a=rsa-sha256; cv=none; b=gyPbnnY5F4Sc/M0gmmqPbpTc0GriNYWGKhtWEYOdisHoV+m6zGZ/oshqqkwjo7GSk6g8Fu u/z8ruyC+tHvUNqp7SsUYY9u5ErsjfDUQAE257/7GI+NRJPIf3oSLqxuj/zRihYAWSwGql XPclVxFWLzoRfh/ga/Ks73he1LoJF04tRxoRjK/OT1ElUuaikxPvhlscqRW4GrrQAveSLW hi6XVODme9eHoYGKW9KbG9F+a4rpZNOaiI1Wz87J0qdVZsXsrb5FdTHiNwbK8/D6tI/Nku dLFn4OjaXhBMjXOJnGNE/TDzvHw/LbRGblJAPkGBnvlCzD+w9pCz8O9r7IpqiA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 2.09 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 379002BAD6 X-Spam-Score: 2.09 X-Migadu-Scanner: scn0.migadu.com X-TUID: aFqQyNdwN2ID * gnu/packages/bioinformatics.scm (sailfish)[arguments]: Use 'search-input-directory' when searching for Eigen headers. * gnu/packages/bioinformatics.scm (nanopolish): Likewise. * gnu/packages/machine-learning.scm (tensorflow): Likewise. --- gnu/packages/bioinformatics.scm | 15 +++++++-------- gnu/packages/machine-learning.scm | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index adc87ea4dd..6bd56ca085 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9499,10 +9499,10 @@ dependency like SeqAn.") ;; Ensure that Eigen headers can be found (setenv "CPLUS_INCLUDE_PATH" - (string-append (assoc-ref inputs "eigen") - "/include/eigen3:" - (or (getenv "CPLUS_INCLUDE_PATH") ""))) - #t))))) + (string-append (search-input-directory + inputs "/include/eigen3") + ":" + (or (getenv "CPLUS_INCLUDE_PATH") "")))))))) (inputs `(("boost" ,boost) ("eigen" ,eigen) @@ -12456,10 +12456,9 @@ choosing which reads pass the filter.") (add-after 'unpack 'find-eigen (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" - (string-append (assoc-ref inputs "eigen") - "/include/eigen3:" - (or (getenv "CPATH") ""))) - #t)) + (string-append + (search-input-directory inputs "/include/eigen3") + ":" (or (getenv "CPATH") ""))))) (delete 'configure) (replace 'install (lambda* (#:key outputs #:allow-other-keys) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 3918d32d2f..3f257df832 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1707,7 +1707,7 @@ set(eigen_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/external/eigen_archive " (string-append (getcwd) "/eigen-src/")) ;; Take Eigen headers from our own package. (("\\$\\{CMAKE_CURRENT_BINARY_DIR\\}/external/eigen_archive") - (string-append (assoc-ref inputs "eigen") "/include/eigen3"))) + (search-input-directory inputs "/include/eigen3"))) ;; Correct the RUNPATH of ops libraries generated for Python. ;; TODO: this doesn't work :( -- 2.32.0