From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id kNNqDhDdMmJ9HQAAgWs5BA (envelope-from ) for ; Thu, 17 Mar 2022 08:02:40 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id KDYjCxDdMmJMnQAAauVa8A (envelope-from ) for ; Thu, 17 Mar 2022 08:02:40 +0100 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 ADDFC30AEF for ; Thu, 17 Mar 2022 08:02:39 +0100 (CET) Received: from localhost ([::1]:51504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nUk9a-0003ki-I4 for larch@yhetil.org; Thu, 17 Mar 2022 03:02:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40660) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nUk79-0002kH-Gz for guix-patches@gnu.org; Thu, 17 Mar 2022 03:00:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58944) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nUk79-0001mm-7e for guix-patches@gnu.org; Thu, 17 Mar 2022 03:00:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nUk78-0008HU-Vx for guix-patches@gnu.org; Thu, 17 Mar 2022 03:00:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54396] [PATCH v2] [WIP] gnu: python-notmuch2: Fix build. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 17 Mar 2022 07:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54396 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Tanguy LE CARROUR Cc: 54396@debbugs.gnu.org Received: via spool by 54396-submit@debbugs.gnu.org id=B54396.164750039431792 (code B ref 54396); Thu, 17 Mar 2022 07:00:02 +0000 Received: (at 54396) by debbugs.gnu.org; 17 Mar 2022 06:59:54 +0000 Received: from localhost ([127.0.0.1]:52841 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nUk6z-0008Gi-Ts for submit@debbugs.gnu.org; Thu, 17 Mar 2022 02:59:54 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:42802) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nUk6x-0008GX-8A for 54396@debbugs.gnu.org; Thu, 17 Mar 2022 02:59:52 -0400 Received: from lprikler-laptop.ist.intra (gw.ist.tugraz.at [129.27.202.101]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4KJygl4ZY6z3x6h; Thu, 17 Mar 2022 07:59:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1647500387; bh=+JKKe2B4+1cERVoT50lqXMy2KNq9+zdF0JKU0lrLiZQ=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=r3AkLoCupijcxtrcYmfL8OfJ4A9hcB4fKbjTfPNm/ZxwBqm+9Q1vI0Y0L7gri4UCf 87MgKys3UbiGdvwZt7oYhizr99anhV1a0wcwAB6tdtoPTwEdYqUiQff27PKHIb4O+x 6yFAyD15IglCKPwFzEImTct5713t4QHDTcmvwsxk= Message-ID: <4235d01b2b9f335451e4715ea90fbe92d8ce7f91.camel@ist.tugraz.at> From: Liliana Marie Prikler Date: Thu, 17 Mar 2022 07:59:48 +0100 In-Reply-To: <164744931122.17491.16594765317356733408@localhost> References: <20220316111624.26189-1-tanguy@bioneland.org> <6b3d3874c3953688431be77f08989ef709780443.camel@ist.tugraz.at> <164743841502.31835.14352244026552742248@localhost> <164744931122.17491.16594765317356733408@localhost> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: waObeELIUl4ypBWmcn/8wQ X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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 X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1647500560; 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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=+JKKe2B4+1cERVoT50lqXMy2KNq9+zdF0JKU0lrLiZQ=; b=N6VIqi/p0Zm1ktlXoSeZGtu2jbowOPNatX5Sy23Tvn0+BenOo2YyTnuSUf31JesDbBZ6XX JmmUUxORqEVN/om5+DZjRGQZRXZ/1K1L+YB18npNBawngM1soNzPtr59Zzm+IstfpkIxlu cEHFTNHi6ik2OjLMji26e2ZHB7hxkG+bA9hceIoYzJasVyj6iTaNSQkIEXMl+5M7Ea7yPK Jsw4BYOcvd5LXJTJQoTdMf8Hk9cxX2HqkYmMvjV1E/iPOpQWYGbby1tFFYgFRNMattJfL3 cjeeW2qYGopeX8VnGvMUHcyXfg/C6YrixAtctm0/YLJ6U7f7jry66FHZ37231Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1647500560; a=rsa-sha256; cv=none; b=e1fC2myav9xyqGsAnRuVWoWawCJu8OTCigd7cHMVa2zdQjPTTpBGvNV1ZFqXQ6QP/DO7OG 6Y7QgZcxBnGm8UojePpST45eZTH/28Smn8VzR+Mwln0m53LIBT2BPcpXkF8drgXFZArUVc DMlgtqrBf3H4TrtHcI1BYud9j9PPiwWjMZX3cJePk97rZqDRqG7+vvY3tqKW4aOXddAXZS E5Iqg896hYIap3QfTp+oVMdMyC4yFizzdCkYJX47ofcjdx1YIRzdkml5IDvMkViBdifBW3 3l4C0qLc7U6XmQQbpRajub9xHpTblj3sqNW+HrE48xv3LZHdWkapIP5moZlebg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=r3AkLoCu; dmarc=fail reason="SPF not aligned (relaxed)" header.from=tugraz.at (policy=none); 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" X-Migadu-Spam-Score: 5.74 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=r3AkLoCu; dmarc=fail reason="SPF not aligned (relaxed)" header.from=tugraz.at (policy=none); 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" X-Migadu-Queue-Id: ADDFC30AEF X-Spam-Score: 5.74 X-Migadu-Scanner: scn1.migadu.com X-TUID: dvWQQF2oiXz/ Hi Tanguy, Am Mittwoch, dem 16.03.2022 um 17:48 +0100 schrieb Tanguy LE CARROUR: > > That is actually a mistake on my part, search-input-file should > > search inputs for "include/notmuch.h" and likewise > > "lib/libnotmuch.so".  > > The dirname is important here, since both constants want > > directories. > > Alternatively, forgoing those constants might be a good idea, but > > is not worth investing too much time in. > > So, I'm leaving those as they are for now. I think you misunderstood me. It is absolutely necessary that you instantiate these variables correctly. It is not necessary to substitute* their uses. > > > If I set `NOTMUCH_VERSION_FILE=''`, I get a "file does not exist" > > > error at build time. So I decided to set it to `/dev/null` > > > instead. > > > Or would it be better if I patched `notmuch` to create the actual > > > version file?! > > I think you ought to debug the build and short-circuit the logic by > > inferring the version number directly where it is needed.  Without > > actual build output that's as much as I can propose. > > Mmm… I've added a new phase to patch the `setup.py`, but couldn't get > the version variable to work. Sorry for my… noobiness!? ^_^' > > ``` > ;; version.txt is not included in notmuch, so we patch in the version > number > (add-after 'create-notmuch-config 'patch-setup.py >   (lambda _ >     (substitute* "setup.py" >       (("with open\\(NOTMUCH_VERSION_FILE\\) as fp:") "") >       (("    VERSION = fp.read\\(\\).strip\\(\\)") "") >       (("version=VERSION,") (string-append "version='" "0.0.0" > "',"))))) > ``` > > I've tried to replace `0.0.0` with `version` or `,version` but that > doesn't seem to be the proper way to do it. substitute* is not nice when dealing with multi-line expressions. I think you could replace NOTMUCH_VERSION_FILE with '/dev/null' and "VERSION = .*" with (string-append "VERSION = " #$version). Cheers