From unknown Sat Jun 21 03:30:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54780] [PATCH] gnu: lttng-ust: Fix dependencies. Resent-From: Olivier Dion Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 00:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54780 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54780@debbugs.gnu.org Cc: Olivier Dion X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164937714518181 (code B ref -1); Fri, 08 Apr 2022 00:20:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 Apr 2022 00:19:05 +0000 Received: from localhost ([127.0.0.1]:33652 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nccLB-0004jB-0k for submit@debbugs.gnu.org; Thu, 07 Apr 2022 20:19:05 -0400 Received: from lists.gnu.org ([209.51.188.17]:53866) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nccL8-0004j3-IF for submit@debbugs.gnu.org; Thu, 07 Apr 2022 20:19:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41086) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nccL8-0003ZR-02 for guix-patches@gnu.org; Thu, 07 Apr 2022 20:19:02 -0400 Received: from smtp.polymtl.ca ([132.207.4.11]:44291) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nccL5-0004GV-Ee for guix-patches@gnu.org; Thu, 07 Apr 2022 20:19:01 -0400 Received: from laura.hitronhub.home (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 2380IjS3008951 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Thu, 7 Apr 2022 20:18:52 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 2380IjS3008951 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1649377132; bh=rHbIPcCZd7IvtQjKk3dBt+IphLBvc/16U4aOPYRMtr4=; h=From:To:Cc:Subject:Date:From; b=dTvwjqkGxWqnBqBOH+L010OuneadFtwIL/lNcArhkjJBACzP/mnUy10gKJHTn5rp1 d/D/6Qto9bWGdZ23BXj3HtQp7M0GTOhxYJ4/W3xTKxw9eTvOB0pW+SVFVFnaxo/PdV mOhnTH4LMcRMRTvSZWa2zTd4m000eO9qjRbrtR+I= From: Olivier Dion Date: Thu, 7 Apr 2022 20:18:44 -0400 Message-Id: <3afb4ed9e9446906504f781dcf047160491ddfff.1649377087.git.olivier.dion@polymtl.ca> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Poly-FromMTA: (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) at Fri, 8 Apr 2022 00:18:45 +0000 Received-SPF: pass client-ip=132.207.4.11; envelope-from=olivier.dion@polymtl.ca; helo=smtp.polymtl.ca X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/packages/instrumentation.scm (lttng-ust): Fix dependencies. [inputs]: Remove liburcu. [propagated-inputs]: Add liburcu. Headers of liburcu are used by headers of lttng. --- gnu/packages/instrumentation.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index ab986bfcc7..45a6872268 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -214,7 +214,9 @@ (define-public lttng-ust "1p7d94r275yvby6zqfxaswdl1q46zxbc8x5rkhnjxrp1d41byrsn")))) (build-system gnu-build-system) (inputs - (list liburcu numactl)) + (list numactl)) + (propagated-inputs + (list liburcu)) (native-inputs (list python-3 pkg-config)) (home-page "https://lttng.org/") -- 2.34.0 From unknown Sat Jun 21 03:30:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54780] [PATCH] gnu: lttng-ust: Fix dependencies. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 14:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54780 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Olivier Dion , 54780@debbugs.gnu.org Received: via spool by 54780-submit@debbugs.gnu.org id=B54780.164942666119750 (code B ref 54780); Fri, 08 Apr 2022 14:05:02 +0000 Received: (at 54780) by debbugs.gnu.org; 8 Apr 2022 14:04:21 +0000 Received: from localhost ([127.0.0.1]:35497 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncpDp-00058U-F7 for submit@debbugs.gnu.org; Fri, 08 Apr 2022 10:04:21 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:41042) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncpDn-00058L-6h for 54780@debbugs.gnu.org; Fri, 08 Apr 2022 10:04:20 -0400 Received: from [192.168.174.254] ([188.189.131.219]) by michel.telenet-ops.be with bizsmtp id GE4H270014kACEs06E4HZQ; Fri, 08 Apr 2022 16:04:17 +0200 Message-ID: From: Maxime Devos Date: Fri, 08 Apr 2022 16:04:16 +0200 In-Reply-To: <3afb4ed9e9446906504f781dcf047160491ddfff.1649377087.git.olivier.dion@polymtl.ca> References: <3afb4ed9e9446906504f781dcf047160491ddfff.1649377087.git.olivier.dion@polymtl.ca> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-I8Ab+RFHSFZs7SXMXBea" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1649426657; bh=Dj0SRaUZi5BFfYiAbfflUNaBQh0YnvoTgDpL0nCn0+4=; h=Subject:From:To:Date:In-Reply-To:References; b=Hm2k+rSCp2XCWRvLpACqBH5N08OLUDahVWB9T2JTQ9tP0cd3c91mOMb6BPwwH42c4 CF7+XFqk7CEOug+FyRjkPgSvrMUin7tziZwsq/DN5y9j/tD+HlPZABQqpaMzzujNmj NxGsD34SCDRH+4M0ryTktrlrSBFLEzjtd2llEL2PPkkJ3nQ9Dpe7J1Gkue1dEuUGT4 ms9aOL0iQwYiYJt39xYuUx30BHe/VNJIUu4VSSIfv0nMPEdkPZzdRM2+S0y6aI6SL4 MVg8xEwI5BkrP59DafwhWJ5pxZx/n8TTOIb40yYNmEgInqAYFm/6xlUzCxhpqN5527 MmzFNvEcn9GmQ== X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-I8Ab+RFHSFZs7SXMXBea Content-Type: multipart/mixed; boundary="=-pv4UoY8L4Fla+rQNZfRw" --=-pv4UoY8L4Fla+rQNZfRw Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Olivier Dion via Guix-patches via schreef op do 07-04-2022 om 20:18 [- 0400]: > Headers of liburcu are used by headers of lttng. This can be addressed without propagation, by substitute*. Something like: (lambda* (#:key inputs #:allow-other-keys) (substitute* (find-files ".h") (("some-liburcu-header.h") (search-input-file inputs "include/some-liburcu-header.h")))) Attached is some more generic and automated code I wrote a while ago. Maybe it's good enough for lttng? Greetings, Maxime. --=-pv4UoY8L4Fla+rQNZfRw Content-Disposition: inline; filename="absolute-inclusions.scm" Content-Type: text/x-scheme; name="absolute-inclusions.scm"; charset="UTF-8" Content-Transfer-Encoding: base64 Ozs7IEdOVSBHdWl4IC0tLSBGdW5jdGlvbmFsIHBhY2thZ2UgbWFuYWdlbWVudCBmb3IgR05VCjs7 OyBDb3B5cmlnaHQgwqkgMjAyMiBNYXhpbWUgRGV2b3MgPG1heGltZWRldm9zQHRlbGVuZXQuYmU+ Cjs7Owo7OzsgVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05VIEd1aXguCjs7Owo7OzsgR05VIEd1aXgg aXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeSBp dAo7OzsgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBh cyBwdWJsaXNoZWQgYnkKOzs7IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb247IGVpdGhlciB2 ZXJzaW9uIDMgb2YgdGhlIExpY2Vuc2UsIG9yIChhdAo7OzsgeW91ciBvcHRpb24pIGFueSBsYXRl ciB2ZXJzaW9uLgo7OzsKOzs7IEdOVSBHdWl4IGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRo YXQgaXQgd2lsbCBiZSB1c2VmdWwsIGJ1dAo7OzsgV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhv dXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgo7OzsgTUVSQ0hBTlRBQklMSVRZIG9yIEZJ VE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiAgU2VlIHRoZQo7OzsgR05VIEdlbmVyYWwg UHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWlscy4KOzs7Cjs7OyBZb3Ugc2hvdWxkIGhhdmUg cmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZQo7OzsgYWxv bmcgd2l0aCBHTlUgR3VpeC4gIElmIG5vdCwgc2VlIDxodHRwOi8vd3d3LmdudS5vcmcvbGljZW5z ZXMvPi4KCihkZWZpbmUtbW9kdWxlIChndWl4IGJ1aWxkIGFic29sdXRlLWluY2x1c2lvbnMpCiAg IzpleHBvcnQgKGFic29sdXRlLWluY2x1c2lvbnMgcGF0Y2gtaGVhZGVyLWluY2x1c2lvbnMpCiAg Izp1c2UtbW9kdWxlIChndWl4IGJ1aWxkIHV0aWxzKQogICM6dXNlLW1vZHVsZSAoaWNlLTkgbWF0 Y2gpCiAgIzp1c2UtbW9kdWxlIChybnJzIGV4Y2VwdGlvbnMpKQoKKGRlZmluZSAoYWJzb2x1dGUt aW5jbHVzaW9ucyBmaWxlcyBoZWFkZXItbG9jYXRpb25zKQogIChzdWJzdGl0dXRlKiBmaWxlcwog ICAgOzsgVE9ETzogYWxsb3cgc3BhY2VzIGJlZm9yZSB0aGUgPCBvciBpbmNsdWRlLCBtYXliZSBy ZWNvZ25pc2UgI2luY2x1ZGUKICAgIDs7ICJmb28iIC4uLgogICAgKCgiI2luY2x1ZGUgPCguKik+ IiBvcmlnaW5hbCBoZWFkZXItbmFtZSkKICAgICAoZ3VhcmQgKGMgKChzZWFyY2gtZXJyb3I/IGMp IG9yaWdpbmFsKSkKICAgICAgIDs7IFRPRE86IHZlcmlmeSB3aXRoIGxpYmdjYyAmIGV0YywgbWF5 YmUgYXZvaWQgaW5jcmVhc2luZyB0aGUgY2xvc3VyZSBzaXplCiAgICAgICA7OyBieSBza2lwcGlu ZyBnbGliYyBhbmQgbGludXggaGVhZGVycyAuLi4KICAgICAgIChmb3JtYXQgI2YgIiNpbmNsdWRl IDx+YT4iCiAgICAgICAgICAgICAgIChzZWFyY2gtaW5wdXQtZmlsZSBoZWFkZXItbG9jYXRpb25z CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCAiaW5jbHVk ZS8iIGhlYWRlci1uYW1lKSkpKSkpKQoKKGRlZmluZSogKHBhdGNoLWhlYWRlci1pbmNsdXNpb25z ICM6a2V5IGlucHV0cyBvdXRwdXRzICM6YWxsb3ctb3RoZXIta2V5cykKICAiUGF0Y2ggaW5jbHVz aW9ucyBpbiBDIGhlYWRlcnMgaW4gT1VUUFVUUyB0byB1c2UgYWJzb2x1dGUgZmlsZSBuYW1lcy4i CiAgKGRlZmluZSBoZWFkZXItbG9jYXRpb25zIChhcHBlbmQgb3V0cHV0cyBpbnB1dHMpKQogIDs7 IFRPRE86IGFyZSB0aGVyZSBhbHNvIG90aGVyIGhlYWRlciBuYW1lcyBpbiB1c2U/CiAgKGRlZmlu ZSBoZWFkZXItZmlsZT8gKGZpbGUtbmFtZS1wcmVkaWNhdGUgIlxcLihofGhwcCkkIikpCiAgKGZv ci1lYWNoIChtYXRjaC1sYW1iZGEKICAgICAgICAgICAgICAoKF8gLiBvdXRwdXQpCiAgICAgICAg ICAgICAgIChhYnNvbHV0ZS1pbmNsdXNpb25zCiAgICAgICAgICAgICAgICAoZmluZC1maWxlcyAo c3RyaW5nLWFwcGVuZCBvdXRwdXQgIi9pbmNsdWRlIikgaGVhZGVyLWZpbGU/KQogICAgICAgICAg ICAgICAgaGVhZGVyLWxvY2F0aW9ucykpKQogICAgICAgICAgICBvdXRwdXRzKSkK --=-pv4UoY8L4Fla+rQNZfRw-- --=-I8Ab+RFHSFZs7SXMXBea Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYlBA4BccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7sOBAP9JEf/ZmAggg/YQWSEodqSTXrwg KwQkSoAVveaHr6dzVAEAl3dcykdqkgiCTDrCJr9v0mVeP/DMyh+O7i9QUU3JWAE= =Ij/C -----END PGP SIGNATURE----- --=-I8Ab+RFHSFZs7SXMXBea-- From unknown Sat Jun 21 03:30:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54780] [PATCH] gnu: lttng-ust: Fix dependencies. Resent-From: Olivier Dion Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 14:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54780 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos , 54780@debbugs.gnu.org Received: via spool by 54780-submit@debbugs.gnu.org id=B54780.164942784621558 (code B ref 54780); Fri, 08 Apr 2022 14:25:02 +0000 Received: (at 54780) by debbugs.gnu.org; 8 Apr 2022 14:24:06 +0000 Received: from localhost ([127.0.0.1]:35517 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncpWv-0005be-TA for submit@debbugs.gnu.org; Fri, 08 Apr 2022 10:24:06 -0400 Received: from smtp.polymtl.ca ([132.207.4.11]:42359) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncpWu-0005b9-1S for 54780@debbugs.gnu.org; Fri, 08 Apr 2022 10:24:04 -0400 Received: from localhost (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 238ENrZx030941 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 8 Apr 2022 10:23:57 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 238ENrZx030941 From: Olivier Dion In-Reply-To: References: <3afb4ed9e9446906504f781dcf047160491ddfff.1649377087.git.olivier.dion@polymtl.ca> Date: Fri, 08 Apr 2022 10:23:53 -0400 Message-ID: <871qy7wt52.fsf@laura> MIME-Version: 1.0 Content-Type: text/plain X-Poly-FromMTA: (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) at Fri, 8 Apr 2022 14:23:53 +0000 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) On Fri, 08 Apr 2022, Maxime Devos wrote: > Olivier Dion via Guix-patches via schreef op do 07-04-2022 om 20:18 [- > 0400]: >> Headers of liburcu are used by headers of lttng. > > This can be addressed without propagation, by substitute*. Something > like: > > (lambda* (#:key inputs #:allow-other-keys) > (substitute* (find-files ".h") > (("some-liburcu-header.h") > (search-input-file inputs "include/some-liburcu-header.h")))) > > Attached is some more generic and automated code I wrote a while ago. > Maybe it's good enough for lttng? Is propagated-inputs not the use case for that or do I have a bad understanding of how propagated-inputs works? -- Olivier Dion oldiob.dev From unknown Sat Jun 21 03:30:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54780] [PATCH] gnu: lttng-ust: Fix dependencies. Resent-From: Olivier Dion Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 14:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54780 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos , 54780@debbugs.gnu.org Received: via spool by 54780-submit@debbugs.gnu.org id=B54780.164942812121961 (code B ref 54780); Fri, 08 Apr 2022 14:29:01 +0000 Received: (at 54780) by debbugs.gnu.org; 8 Apr 2022 14:28:41 +0000 Received: from localhost ([127.0.0.1]:35522 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncpbN-0005i9-Db for submit@debbugs.gnu.org; Fri, 08 Apr 2022 10:28:41 -0400 Received: from smtp.polymtl.ca ([132.207.4.11]:52694) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncpbL-0005hw-4w for 54780@debbugs.gnu.org; Fri, 08 Apr 2022 10:28:39 -0400 Received: from localhost (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 238ESSLY005077 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 8 Apr 2022 10:28:33 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 238ESSLY005077 From: Olivier Dion In-Reply-To: <871qy7wt52.fsf@laura> References: <3afb4ed9e9446906504f781dcf047160491ddfff.1649377087.git.olivier.dion@polymtl.ca> <871qy7wt52.fsf@laura> Date: Fri, 08 Apr 2022 10:28:28 -0400 Message-ID: <87v8vjvecz.fsf@laura> MIME-Version: 1.0 Content-Type: text/plain X-Poly-FromMTA: (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) at Fri, 8 Apr 2022 14:28:28 +0000 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) On Fri, 08 Apr 2022, Olivier Dion wrote: > On Fri, 08 Apr 2022, Maxime Devos wrote: >> Olivier Dion via Guix-patches via schreef op do 07-04-2022 om 20:18 [- >> 0400]: >>> Headers of liburcu are used by headers of lttng. >> >> This can be addressed without propagation, by substitute*. Something >> like: >> >> (lambda* (#:key inputs #:allow-other-keys) >> (substitute* (find-files ".h") >> (("some-liburcu-header.h") >> (search-input-file inputs "include/some-liburcu-header.h")))) >> >> Attached is some more generic and automated code I wrote a while ago. >> Maybe it's good enough for lttng? > > Is propagated-inputs not the use case for that or do I have a bad > understanding of how propagated-inputs works? To be clear about my commit. Some headers of liburcu are required by the application using lttng-ust. To me, this translated into inputs that are propagated. Your solution would reduce the set of propagated inputs (liburcu comes with many flavors but only one is used by lttng-ust), by I find it ad-hoc and don't fully understand it. -- Olivier Dion oldiob.dev From unknown Sat Jun 21 03:30:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54780] [PATCH] gnu: lttng-ust: Fix dependencies. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 15:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54780 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Olivier Dion , 54780@debbugs.gnu.org Received: via spool by 54780-submit@debbugs.gnu.org id=B54780.164943143927680 (code B ref 54780); Fri, 08 Apr 2022 15:24:02 +0000 Received: (at 54780) by debbugs.gnu.org; 8 Apr 2022 15:23:59 +0000 Received: from localhost ([127.0.0.1]:35621 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncqSs-0007CN-U6 for submit@debbugs.gnu.org; Fri, 08 Apr 2022 11:23:59 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:57526) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncqSr-0007CD-1x for 54780@debbugs.gnu.org; Fri, 08 Apr 2022 11:23:58 -0400 Received: from [172.20.10.5] ([213.119.162.199]) by baptiste.telenet-ops.be with bizsmtp id GFPu2700E4JS4rZ01FPu0f; Fri, 08 Apr 2022 17:23:55 +0200 Message-ID: <6d081788eadef2a6a17e4fbf385ee1c08c389385.camel@telenet.be> From: Maxime Devos Date: Fri, 08 Apr 2022 17:23:48 +0200 In-Reply-To: <871qy7wt52.fsf@laura> References: <3afb4ed9e9446906504f781dcf047160491ddfff.1649377087.git.olivier.dion@polymtl.ca> <871qy7wt52.fsf@laura> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-foCaNfKNWlPELnqREM2R" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1649431435; bh=MWi+4dfJnD0EXN/zQzZsvCGmvGfnNHT/mIE/5KO0Vpw=; h=Subject:From:To:Date:In-Reply-To:References; b=XfbtDHbOzOqQK0agNBYo9leAxaG8b6B2Z46FkPTv6b0Yd6+ecqt20+fm7YvP08RDo D9vGP3b0lW/ysE+QxYlGBjqsI7HwILJ3YbCYuQVUWX1+HIPjMtxcH6MST0iWAYsAbi kL50iLL/u5053vdrSunqfyGWhqDHleEkNrq00pdkxu1JhLT9ZTS9LNQCzFc0hx5jVi q+r8ELLgFmAvr0i2K2dziS8jaETOb30yr+M69P/16vKj2GIkkytVuDntA12NO/lEsE /C/Ciae75A7Zxm9uoTEYSInGdUxZMEecV+XzYUyLKExCGg59uvc0It4SH92Me9Yoqc kXPEgndEGwswA== X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-foCaNfKNWlPELnqREM2R Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Olivier Dion schreef op vr 08-04-2022 om 10:23 [-0400]: > > 0400]: > > > Headers of liburcu are used by headers of lttng. > >=20 > > This can be addressed without propagation, by substitute*.=C2=A0 > > Something > > like: > >=20 > > =C2=A0=C2=A0 (lambda* (#:key inputs #:allow-other-keys) > > =C2=A0=C2=A0=C2=A0=C2=A0 (substitute* (find-files ".h") > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (("some-liburcu-header.h") > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (search-input-file inputs "i= nclude/some-liburcu- > > header.h")))) > >=20 > > Attached is some more generic and automated code I wrote a > > while ago. Maybe it's good enough for lttng? >=20 > Is propagated-inputs not the use case for that or do I have a bad > understanding of how propagated-inputs works? Propagation is the standard work-around if not better alternatives are known. But it has some downsides: * if liburcu contained a binary 'bin/urcu', then if you install lttng-ust, you would also get 'bin/urcu' in the profile even though you did not ask for it. * propagation is a source of slowness. See, e.g., . * It can also make updating individual packages (with "guix pull && guix package -u this-package") more difficult since it might be necessary to update multiple packages at the same time to avoid propagation conflicts. * (not applicable to this case, given that the lttng-ust library (probably) refers to the liburcu library): "guix gc --references" does not known about these kind of =E2=80=98hidden=E2=80=99 references. As such, when feasible, propagation is avoided. Greetings, Maxime. --=-foCaNfKNWlPELnqREM2R Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYlBThRccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7tcDAQCP5WtBwYLEl4AYBdEqqhHcGLjh yLkHf08cdGh5rDtEJwD9FeEXa076uuqpYTABb754+E+r/y8M18BFCZGomDR9wQI= =RauP -----END PGP SIGNATURE----- --=-foCaNfKNWlPELnqREM2R-- From unknown Sat Jun 21 03:30:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54780] (C include header depropagation) Re: [bug#54780] [PATCH] gnu: lttng-ust: Fix dependencies. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 15:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54780 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Olivier Dion , 54780@debbugs.gnu.org Received: via spool by 54780-submit@debbugs.gnu.org id=B54780.164943194028847 (code B ref 54780); Fri, 08 Apr 2022 15:33:01 +0000 Received: (at 54780) by debbugs.gnu.org; 8 Apr 2022 15:32:20 +0000 Received: from localhost ([127.0.0.1]:35656 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncqay-0007V6-BD for submit@debbugs.gnu.org; Fri, 08 Apr 2022 11:32:20 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:40724) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncqav-0007Uv-Hh for 54780@debbugs.gnu.org; Fri, 08 Apr 2022 11:32:18 -0400 Received: from [172.20.10.5] ([213.119.162.199]) by baptiste.telenet-ops.be with bizsmtp id GFYF2700D4JS4rZ01FYFBQ; Fri, 08 Apr 2022 17:32:16 +0200 Message-ID: <3e664c3fdc041bb69cdff0f03259e5694eced547.camel@telenet.be> From: Maxime Devos Date: Fri, 08 Apr 2022 17:32:15 +0200 In-Reply-To: <87v8vjvecz.fsf@laura> References: <3afb4ed9e9446906504f781dcf047160491ddfff.1649377087.git.olivier.dion@polymtl.ca> <871qy7wt52.fsf@laura> <87v8vjvecz.fsf@laura> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-uC9+Cbj1A+iyVwpElFiD" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1649431936; bh=qJcHe3Q2lsi/qP4zr8OD9+r7d1Pf1mzwPRK9BTe2sNA=; h=Subject:From:To:Date:In-Reply-To:References; b=b/e8E082J/CZ8vTb3hy0OCCOjVrvUCLDTJNlG4tuBG6+g/Gq8pPMCYY6wTY9VPz+o /YmT4E6HfXHdVItW3Alz2Lu+uMkjT7BkyYWxuyK8/DGUwDLRz4MXl+yEFmcMwiop+q iUOmcKYVjh8HRU5P5HqKbIuiQn7uybcI8S0shJ2uLmHCsEVX50Y4uzj5R0c9XRbq9t K31hAxv224FTx0JzaXB6Pziyiu8r3e0BKFsAMyc9+0Wzzuwd5WOqBWtlwIYSzpBr3v sxvx5WN64fkKyeysVUsB8y58Oh1j/k1Y7ybFk8s6+fbwVwftRQBx0y2Mto14d4OKIr pdORrQatRdVGA== X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-uC9+Cbj1A+iyVwpElFiD Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Olivier Dion schreef op vr 08-04-2022 om 10:28 [-0400]: > To be clear about my commit.=C2=A0 Some headers of liburcu are required b= y > the application using lttng-ust.=C2=A0 To me, this translated into inputs > that are propagated.=C2=A0 Your solution would reduce the set of propagat= ed > inputs (liburcu comes with many flavors but only one is used by > lttng-ust), by I find it ad-hoc and don't fully understand it. The idea is to eventually make 'patch-header-inclusions' a default phase in %standard-phases of gnu-build-system, making it non-ad-hoc. Greetings, Maxime. --=-uC9+Cbj1A+iyVwpElFiD Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYlBVfxccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7rgeAP44wdfnsZVgBOTenh6X5wXD0HX3 AKQ/W2bGeiAIRM6hFgD/RwwT05i7laoQfZj+JdAP7tLA4aRZF1fMGKDQMvfxuAE= =xhBM -----END PGP SIGNATURE----- --=-uC9+Cbj1A+iyVwpElFiD-- From unknown Sat Jun 21 03:30:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54780] [PATCH] gnu: lttng-ust: Fix dependencies. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 15:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54780 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Olivier Dion , 54780@debbugs.gnu.org Received: via spool by 54780-submit@debbugs.gnu.org id=B54780.164943240529629 (code B ref 54780); Fri, 08 Apr 2022 15:41:02 +0000 Received: (at 54780) by debbugs.gnu.org; 8 Apr 2022 15:40:05 +0000 Received: from localhost ([127.0.0.1]:35679 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncqiT-0007hp-E8 for submit@debbugs.gnu.org; Fri, 08 Apr 2022 11:40:05 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:50136) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncqiR-0007hW-3R for 54780@debbugs.gnu.org; Fri, 08 Apr 2022 11:40:04 -0400 Received: from [172.20.10.5] ([213.119.162.199]) by baptiste.telenet-ops.be with bizsmtp id GFfv2700U4JS4rZ01Fg1Yk; Fri, 08 Apr 2022 17:40:01 +0200 Message-ID: <7a376302aab455dae361205a491a4e5fd5bd5922.camel@telenet.be> From: Maxime Devos Date: Fri, 08 Apr 2022 17:39:55 +0200 In-Reply-To: <87v8vjvecz.fsf@laura> References: <3afb4ed9e9446906504f781dcf047160491ddfff.1649377087.git.olivier.dion@polymtl.ca> <871qy7wt52.fsf@laura> <87v8vjvecz.fsf@laura> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-ix/0nxdpmSE+UPC5LmeB" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1649432401; bh=nKsQISJQfdiM+XFp3QSdAbABeBSvETiJbAssMaGEfXM=; h=Subject:From:To:Date:In-Reply-To:References; b=W38Y/KxPHUJOND8XQPmhY+nW6oL/gC9Un5Af9Nwo5nkqJjDOArogr24pMdi74jgPC sjfS4iTV4RtxlTuNKCApS1Am773QKFjexLThGP8zZccy0bkm/jfxDU7uZWMCIssde8 AI9g6GNhl6NtELfkz55wwLIZrbJzv36X4kt9wjO7WotLLR5tVEGPpacyBpujtslDJg NjgY89ZilGSqr6Gt1ZySrBRWG8bjjz3yfmXttO7GpU8kVAnC+JR74LJFWaQwjQ7V8g 5Ci5DzmMcrGn2+M4Cn6weDhXB/U/xVkT4LrXV7DSCpiqCmq4Ozblh3LQTjLV/dobV/ lX4IfZgGAeDBQ== X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-ix/0nxdpmSE+UPC5LmeB Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Olivier Dion schreef op vr 08-04-2022 om 10:28 [-0400]: > =C2=A0and don't fully understand it. lttn-ust probably has some header /gnu/store/...-lttng-unst-VERSION/include/lttng.h or the like. It would look something like: [...] #include int lttng_foo(urcu_stuff *bar); [..] Then the 'patch-header-inclusion' phase detects the #include , looks for include/liburcu.h in the package inputs, and finds /gnu/store/...-liburcu-VERSION/include/liburcu.h. It then replaces liburcu.h by /gnu/store/...-liburcu-VERSION/include/liburcu.h: [...] #include int lttng_foo(urcu_stuff *bar); [...] Now, suppose I build an application dependning on lttng-ust. Then the C compiler will =E2=80=98include=E2=80=99 'lttng.h' in the {CROSS_,}C_INLUD= E_PATH.=20 Then it sees: #include Now, as this is an absolute /gnu/store/... file name, the compiler knows where to find it without looking into {CROSS_,}C_INCLUDE_PATH, so it will find the header even though it might not be in {CROSS_,}C_INCLUDE_PATH. It's the same system as doing some 'substitute*' to bake in the absolute file name of some executable into the compiled application to avoid relying on PATH, except applied to C headers instead of executables and {CROSS_,}C_CINCLUDE_PATH instead of PATH. Greetings, Maxime. --=-ix/0nxdpmSE+UPC5LmeB Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYlBXSxccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7oZ8AQCZSXtYO8e0gbzzhV+ET0hbWAaD edv+OginZvN/G9SsrgEA3QUBSKCX1aCEMG4mRV15RoTANP5HV7wah4hRRr0/4AE= =H2n+ -----END PGP SIGNATURE----- --=-ix/0nxdpmSE+UPC5LmeB-- From unknown Sat Jun 21 03:30:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54780] [PATCH] gnu: lttng-ust: Fix dependencies. Resent-From: Olivier Dion Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 16:00:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54780 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos , 54780@debbugs.gnu.org Received: via spool by 54780-submit@debbugs.gnu.org id=B54780.164943359131507 (code B ref 54780); Fri, 08 Apr 2022 16:00:03 +0000 Received: (at 54780) by debbugs.gnu.org; 8 Apr 2022 15:59:51 +0000 Received: from localhost ([127.0.0.1]:35683 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncr1b-0008C6-4L for submit@debbugs.gnu.org; Fri, 08 Apr 2022 11:59:51 -0400 Received: from smtp.polymtl.ca ([132.207.4.11]:35130) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncr1Z-0008Bs-Fo for 54780@debbugs.gnu.org; Fri, 08 Apr 2022 11:59:50 -0400 Received: from localhost (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 238FxcbF026236 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 8 Apr 2022 11:59:43 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 238FxcbF026236 From: Olivier Dion In-Reply-To: <7a376302aab455dae361205a491a4e5fd5bd5922.camel@telenet.be> References: <3afb4ed9e9446906504f781dcf047160491ddfff.1649377087.git.olivier.dion@polymtl.ca> <871qy7wt52.fsf@laura> <87v8vjvecz.fsf@laura> <7a376302aab455dae361205a491a4e5fd5bd5922.camel@telenet.be> Date: Fri, 08 Apr 2022 11:59:38 -0400 Message-ID: <87sfqnva51.fsf@laura> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Poly-FromMTA: (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) at Fri, 8 Apr 2022 15:59:38 +0000 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) On Fri, 08 Apr 2022, Maxime Devos wrote: > Olivier Dion schreef op vr 08-04-2022 om 10:28 [-0400]: >> =C2=A0and don't fully understand it. > > lttn-ust probably has some header > /gnu/store/...-lttng-unst-VERSION/include/lttng.h or the like. > It would look something like: > > [...] > #include > int lttng_foo(urcu_stuff *bar); > [..] > > Then the 'patch-header-inclusion' phase detects the #include > , looks for include/liburcu.h in the package inputs, and > finds /gnu/store/...-liburcu-VERSION/include/liburcu.h. It then > replaces liburcu.h by /gnu/store/...-liburcu-VERSION/include/liburcu.h: > > [...] > #include > int lttng_foo(urcu_stuff *bar); > [...] > > Now, suppose I build an application dependning on lttng-ust. Then the > C compiler will =E2=80=98include=E2=80=99 'lttng.h' in the {CROSS_,}C_INL= UDE_PATH.=20 > Then it sees: > > #include > > Now, as this is an absolute /gnu/store/... file name, the compiler > knows where to find it without looking into {CROSS_,}C_INCLUDE_PATH, so > it will find the header even though it might not be in > {CROSS_,}C_INCLUDE_PATH. > > It's the same system as doing some 'substitute*' to bake in the > absolute file name of some executable into the compiled application to > avoid relying on PATH, except applied to C headers instead of > executables and {CROSS_,}C_CINCLUDE_PATH instead of PATH. Okay cool! Thanks for the details. I will change my patch with your substitute. --=20 Olivier Dion oldiob.dev From unknown Sat Jun 21 03:30:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54780] [PATCH] gnu: lttng-ust: Fix dependencies. Resent-From: Olivier Dion Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 17:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54780 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos , 54780@debbugs.gnu.org Received: via spool by 54780-submit@debbugs.gnu.org id=B54780.16494382737498 (code B ref 54780); Fri, 08 Apr 2022 17:18:02 +0000 Received: (at 54780) by debbugs.gnu.org; 8 Apr 2022 17:17:53 +0000 Received: from localhost ([127.0.0.1]:35854 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncsF6-0001ws-Uu for submit@debbugs.gnu.org; Fri, 08 Apr 2022 13:17:53 -0400 Received: from smtp.polymtl.ca ([132.207.4.11]:57837) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncsF5-0001we-8P for 54780@debbugs.gnu.org; Fri, 08 Apr 2022 13:17:51 -0400 Received: from localhost (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 238HHeqj011624 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 8 Apr 2022 13:17:45 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 238HHeqj011624 From: Olivier Dion In-Reply-To: <7a376302aab455dae361205a491a4e5fd5bd5922.camel@telenet.be> References: <3afb4ed9e9446906504f781dcf047160491ddfff.1649377087.git.olivier.dion@polymtl.ca> <871qy7wt52.fsf@laura> <87v8vjvecz.fsf@laura> <7a376302aab455dae361205a491a4e5fd5bd5922.camel@telenet.be> Date: Fri, 08 Apr 2022 13:17:40 -0400 Message-ID: <87o81bv6iz.fsf@laura> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Poly-FromMTA: (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) at Fri, 8 Apr 2022 17:17:40 +0000 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) On Fri, 08 Apr 2022, Maxime Devos wrote: > Olivier Dion schreef op vr 08-04-2022 om 10:28 [-0400]: >> =C2=A0and don't fully understand it. > Now, suppose I build an application dependning on lttng-ust. Then the > C compiler will =E2=80=98include=E2=80=99 'lttng.h' in the {CROSS_,}C_INL= UDE_PATH.=20 > Then it sees: > > #include > > Now, as this is an absolute /gnu/store/... file name, the compiler > knows where to find it without looking into {CROSS_,}C_INCLUDE_PATH, so > it will find the header even though it might not be in > {CROSS_,}C_INCLUDE_PATH. Here's what I have now: -------------------- (modify-phases %standard-phases (add-after 'patch-source-shebangs 'patch-source-headers (lambda* (#:key inputs #:allow-other-keys) (substitute* (find-files "./include" ".h") (("<(urcu/(compiler|pointer|arch|system|uatomic|config|list|= tls-compat|debug|ref|rculist).h)>" _ letters _) (format #f "<~a>" (search-input-file inputs (string-append "include/" letter= s)))))))) -------------------- this seems to build the package correctly and also change the RCU headers for lttng-ust. However, liburcu also include some architecture specific headers. So I get the following error while compiling my program: -------------------- In file included from /gnu/store/5qk5mmffc1m9cla71jywn0qz03bk6yhi-profile/i= nclude/lttng/urcu/pointer.h:14, from /gnu/store/5qk5mmffc1m9cla71jywn0qz03bk6yhi-profile/i= nclude/lttng/tracepoint-rcu.h:11, from /gnu/store/5qk5mmffc1m9cla71jywn0qz03bk6yhi-profile/i= nclude/lttng/tracepoint.h:13, from tracepoint.h:10, from tracepoint.c:4: /gnu/store/25nlsljfziysgbhhj9nhwfm4qn5h4b71-liburcu-0.13.1/include/urcu/arc= h.h:65:10: fatal error: urcu/arch/x86.h: No such file or directory 65 | #include | ^~~~~~~~~~~~~~~~~ compilation terminated. -------------------- How could this be fix? That would require to modify the inputs no? --=20 Olivier Dion oldiob.dev From unknown Sat Jun 21 03:30:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54780] [PATCH] gnu: lttng-ust: Fix dependencies. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 19:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54780 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Olivier Dion , 54780@debbugs.gnu.org Received: via spool by 54780-submit@debbugs.gnu.org id=B54780.164944690521608 (code B ref 54780); Fri, 08 Apr 2022 19:42:02 +0000 Received: (at 54780) by debbugs.gnu.org; 8 Apr 2022 19:41:45 +0000 Received: from localhost ([127.0.0.1]:36013 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncuUL-0005cS-GK for submit@debbugs.gnu.org; Fri, 08 Apr 2022 15:41:45 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:54344) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncuUI-0005cG-B4 for 54780@debbugs.gnu.org; Fri, 08 Apr 2022 15:41:43 -0400 Received: from [172.20.10.5] ([213.119.159.236]) by michel.telenet-ops.be with bizsmtp id GKhg2700156K2kd06Khg5u; Fri, 08 Apr 2022 21:41:40 +0200 Message-ID: <77e920c46bbecdbc2164151b0b194ef86bb54357.camel@telenet.be> From: Maxime Devos Date: Fri, 08 Apr 2022 21:41:34 +0200 In-Reply-To: <87o81bv6iz.fsf@laura> References: <3afb4ed9e9446906504f781dcf047160491ddfff.1649377087.git.olivier.dion@polymtl.ca> <871qy7wt52.fsf@laura> <87v8vjvecz.fsf@laura> <7a376302aab455dae361205a491a4e5fd5bd5922.camel@telenet.be> <87o81bv6iz.fsf@laura> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-nNTOq+Jh24t7I4d8MuE/" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1649446900; bh=aRWw6M9r63A5BXpilT68rtsgkKLUh7tJm+sBqO0Jypc=; h=Subject:From:To:Date:In-Reply-To:References; b=DmsDIVTnO6/uz/Jfy1lzkHtaPmUzX7qhb/TwhBXAV8n7pRr+3B4UXIbQ2pOKSkB2t kM9c2HwItWWLulOe8jMQNs3T+jwebPO5BXPmSlxVcvn5M3q5eGswyg/4r5AVXbj9QP C/gYuw8VrYjDtCxgu2E0gYpdl/FM1JZprsjaYsZlS113HSAYdf+PRWIBugaVEuqXqv l+8ozj5X75ZsQI50st+d5Mz0DkmWEsWP3sjEBARQPeR5PcoLYW5pPB1VBwtvqJMaLW mRordynptN/mvbSh1Hy7P+aKdSqeK7qVxjuGmDz2NY5G9qQs1fcDUvRY+iLGA4VvF/ BatZ+2TUOQ8yA== X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-nNTOq+Jh24t7I4d8MuE/ Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Olivier Dion schreef op vr 08-04-2022 om 13:17 [-0400]: > -------------------- > (modify-phases %standard-phases > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (add-after 'patch-source= -shebangs 'patch-source-headers > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (lambda* (#:= key inputs #:allow-other-keys) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 = (substitute* (find-files "./include" ".h") > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 (("<(urcu/(compiler|pointer|arch|system|uatomic|config|list|tl= s-compat|debug|ref|rculist).h)>" _ letters _) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 (format #f "<~a>" > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (search-= input-file inputs > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (string-append "include/" letters)))))))) This is for the lttng-ust package, right? The idea was to do this in a post-install phase of liburcu. > -------------------- >=20 > this seems to build the package correctly and also change the RCU > headers for lttng-ust.=C2=A0 However, liburcu also include some architect= ure > specific headers.=C2=A0 So I get the following error while compiling my > program: >=20 > -------------------- > In file included from /gnu/store/5qk5mmffc1m9cla71jywn0qz03bk6yhi-profile= /include/lttng/urcu/pointer.h:14, > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0 from /gnu/store/5qk5mmffc1m9cla71jywn0qz03bk6yhi-p= rofile/include/lttng/tracepoint-rcu.h:11, > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0 from /gnu/store/5qk5mmffc1m9cla71jywn0qz03bk6yhi-p= rofile/include/lttng/tracepoint.h:13, > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0 from tracepoint.h:10, > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0 from tracepoint.c:4: > /gnu/store/25nlsljfziysgbhhj9nhwfm4qn5h4b71-liburcu-0.13.1/include/urcu/a= rch.h:65:10: fatal error: urcu/arch/x86.h: No such file or directory > =C2=A0=C2=A0 65 | #include > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 ^~~~~~~~~~~~~~~~~ > compilation terminated. > -------------------- >=20 > How could this be fix? That would require to modify the inputs no? I suggest moving the post-unpack substitute* phase from lttng-ust to a post-install phase in liburcu. That way, urcu/arch.h can be patched to use an absolute file name. Also, this ... (urcu/(compiler|pointer|arch|system|uatomic|config|list|tls compat|debug|r= ef|rculist).h)> seems rather fragile and could easily break on future updates of lttng-ust. The idea of the 'absolute-inclusions.scm' file I sent, is to automate thing= s. More concretely, my suggestion is to: * add absolute-inclusions.scm to the Guix repo, in guix/build * modify liburcu to: (package (name "liburcu") [...] (arguments (list #:imported-modules `(,@%gnu-build-system-modules (guix build ab= solute-inclusions)) #:modules '((guix build gnu-build-system) (guix build absolute-inclusions)) #:phases #~(modify-phases %standard-phases (add-after 'install 'absolute-inclusions absolute-inclusion= s))))) Greetings, Maxime. --=-nNTOq+Jh24t7I4d8MuE/ Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYlCP7hccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7hqmAP9HpfhoHCwbrOVqOoLh+1LmAeeF GQ9SiByJWXkBc2BhQAEAgvsrNUW7m4S5uzI4Fau+NsnLuUoSxB0Z+tAxp8oyXw4= =Nyic -----END PGP SIGNATURE----- --=-nNTOq+Jh24t7I4d8MuE/-- From unknown Sat Jun 21 03:30:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54780] [PATCH] gnu: lttng-ust: Fix dependencies. Resent-From: Olivier Dion Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 22:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54780 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos , 54780@debbugs.gnu.org Received: via spool by 54780-submit@debbugs.gnu.org id=B54780.164945863016691 (code B ref 54780); Fri, 08 Apr 2022 22:58:01 +0000 Received: (at 54780) by debbugs.gnu.org; 8 Apr 2022 22:57:10 +0000 Received: from localhost ([127.0.0.1]:36271 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncxXR-0004L9-Ov for submit@debbugs.gnu.org; Fri, 08 Apr 2022 18:57:09 -0400 Received: from smtp.polymtl.ca ([132.207.4.11]:34846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncxXO-0004Kh-Ui for 54780@debbugs.gnu.org; Fri, 08 Apr 2022 18:57:08 -0400 Received: from localhost (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 238MutXi021258 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 8 Apr 2022 18:57:00 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 238MutXi021258 From: Olivier Dion In-Reply-To: <77e920c46bbecdbc2164151b0b194ef86bb54357.camel@telenet.be> References: <3afb4ed9e9446906504f781dcf047160491ddfff.1649377087.git.olivier.dion@polymtl.ca> <871qy7wt52.fsf@laura> <87v8vjvecz.fsf@laura> <7a376302aab455dae361205a491a4e5fd5bd5922.camel@telenet.be> <87o81bv6iz.fsf@laura> <77e920c46bbecdbc2164151b0b194ef86bb54357.camel@telenet.be> Date: Fri, 08 Apr 2022 18:56:55 -0400 Message-ID: <87lewfuqtk.fsf@laura> MIME-Version: 1.0 Content-Type: text/plain X-Poly-FromMTA: (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) at Fri, 8 Apr 2022 22:56:55 +0000 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) On Fri, 08 Apr 2022, Maxime Devos wrote: > Olivier Dion schreef op vr 08-04-2022 om 13:17 [-0400]: > * add absolute-inclusions.scm to the Guix repo, in guix/build > * modify liburcu to: > > (package > (name "liburcu") > [...] > (arguments > (list #:imported-modules `(,@%gnu-build-system-modules (guix build absolute-inclusions)) > #:modules '((guix build gnu-build-system) > (guix build absolute-inclusions)) > #:phases > #~(modify-phases %standard-phases > (add-after 'install 'absolute-inclusions > absolute-inclusions))))) So I have a patch that incorporate your proposal (see next response). However, I have to add the absolute-inclusions phases for both liburcu and lttng-ust. -- Olivier Dion oldiob.dev From unknown Sat Jun 21 03:30:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54780] [PATCH v2 1/2] guix: build: Add absolute-inclusions.scm. Resent-From: Olivier Dion Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 23:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54780 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Olivier Dion , Maxime Devos , 54780@debbugs.gnu.org Received: via spool by 54780-submit@debbugs.gnu.org id=B54780.164945974118415 (code B ref 54780); Fri, 08 Apr 2022 23:16:02 +0000 Received: (at 54780) by debbugs.gnu.org; 8 Apr 2022 23:15:41 +0000 Received: from localhost ([127.0.0.1]:36277 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncxpN-0004mw-AS for submit@debbugs.gnu.org; Fri, 08 Apr 2022 19:15:41 -0400 Received: from smtp.polymtl.ca ([132.207.4.11]:48625) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncxpL-0004mY-64 for 54780@debbugs.gnu.org; Fri, 08 Apr 2022 19:15:39 -0400 Received: from laura.hitronhub.home (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 238NFOOG032495 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Fri, 8 Apr 2022 19:15:32 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 238NFOOG032495 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1649459733; bh=TCzed2oCGaucY8qT+ju2eKl/nQUoGndQUISZrEph/cY=; h=From:To:Subject:Date:In-Reply-To:References:From; b=gRrn8ZdxO3d/jNtmjy+7XO6X7pj0qmIt673uaiNT6xVdd714+eAkXMsMTJYtW0vhR fz11+/68d3UvSvgqSOt+30zgJyiIh9k0S4wWIHmAbt42HVE10bC7D/7itDGy6Aczz5 vQB6cmUCZ4v+IWgaL5GmD7zduxJWIPpwnPBrw9L8= From: Olivier Dion Date: Fri, 8 Apr 2022 19:15:22 -0400 Message-Id: <4b19827ee0d266ecd80dc7c5d776f3ffd764a575.1649459701.git.olivier.dion@polymtl.ca> X-Mailer: git-send-email 2.34.0 In-Reply-To: <87lewfuqtk.fsf@laura> References: <87lewfuqtk.fsf@laura> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Poly-FromMTA: (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) at Fri, 8 Apr 2022 23:15:24 +0000 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * guix/build/absolute-inclusions.scm: New file. * Makefile.am (MODULES): Add it here. --- Makefile.am | 1 + guix/build/absolute-inclusions.scm | 51 ++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 guix/build/absolute-inclusions.scm diff --git a/Makefile.am b/Makefile.am index fecce7c6f7..394df67016 100644 --- a/Makefile.am +++ b/Makefile.am @@ -181,6 +181,7 @@ MODULES = \ guix/diagnostics.scm \ guix/ui.scm \ guix/status.scm \ + guix/build/absolute-inclusions.scm \ guix/build/android-ndk-build-system.scm \ guix/build/ant-build-system.scm \ guix/build/download.scm \ diff --git a/guix/build/absolute-inclusions.scm b/guix/build/absolute-inclusions.scm new file mode 100644 index 0000000000..06b4cd7beb --- /dev/null +++ b/guix/build/absolute-inclusions.scm @@ -0,0 +1,51 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Maxime Devos +;;; Copyright © 2022 Olivier Dion +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix build absolute-inclusions) + #:use-module (guix build utils) + #:use-module (ice-9 match) + #:use-module (rnrs exceptions) + #:export (absolute-inclusions patch-header-inclusions)) + +(define (absolute-inclusions files header-locations) + (substitute* files + (("^[ \t]*#[ \t]*include[ \t]*<(.*)>[ \t]*" original header-name) + (guard (c ((search-error? c) original)) + ;; TODO: verify with libgcc & etc, maybe avoid increasing the + ;; closure size by skipping glibc and linux headers ... + (format #f "#include <~a>" + (search-input-file header-locations + (string-append "include/" header-name))))))) + +(define header-file? + ;; See gcc(1) for the list of suffixes. + (let ((suffixes (list "h" "hh" "H" "hp" "hxx" "hpp" "HPP" "h++" "tcc"))) + (file-name-predicate + (format #f "\\.(~a)$" (string-join suffixes "|" 'infix))))) + +(define* (patch-header-inclusions #:key inputs outputs #:allow-other-keys) + "Patch inclusions in C headers in OUTPUTS to use absolute file names." + (define header-locations (append outputs inputs)) + (for-each (match-lambda + ((_ . output) + (absolute-inclusions + (find-files (string-append output "/include") + header-file?) + header-locations))) + outputs)) -- 2.34.0 From unknown Sat Jun 21 03:30:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54780] [PATCH v2 2/2] gnu: packages: Use absolute headers inclusion. Resent-From: Olivier Dion Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 23:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54780 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Olivier Dion , Maxime Devos , 54780@debbugs.gnu.org Received: via spool by 54780-submit@debbugs.gnu.org id=B54780.164945974418424 (code B ref 54780); Fri, 08 Apr 2022 23:16:02 +0000 Received: (at 54780) by debbugs.gnu.org; 8 Apr 2022 23:15:44 +0000 Received: from localhost ([127.0.0.1]:36279 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncxpP-0004n6-Oj for submit@debbugs.gnu.org; Fri, 08 Apr 2022 19:15:44 -0400 Received: from smtp.polymtl.ca ([132.207.4.11]:57875) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncxpL-0004md-TY for 54780@debbugs.gnu.org; Fri, 08 Apr 2022 19:15:40 -0400 Received: from laura.hitronhub.home (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 238NFOOH032495 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Fri, 8 Apr 2022 19:15:33 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 238NFOOH032495 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1649459734; bh=gXlbJq8Fec9q6kndZpAQXdOuLpMaxtzBWMUpNOLrMe4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=vZC5OYcp9r1WLfE8SHl4V8tfd8BCUIF4NFVfv8IiUXYs1J27OnsSMw4IoeJ/RJp7L MK8C8POWJ1u0+HpGNzMXhaejCpvr5C5hi2YwVrbq16/hb0JyKfRBHvT7Z1aShDmI/x Yt4ee40xY1uHLmCNno3/fFT9gnr3CXF5GfDeYyI4= From: Olivier Dion Date: Fri, 8 Apr 2022 19:15:23 -0400 Message-Id: X-Mailer: git-send-email 2.34.0 In-Reply-To: <87lewfuqtk.fsf@laura> References: <87lewfuqtk.fsf@laura> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Poly-FromMTA: (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) at Fri, 8 Apr 2022 23:15:24 +0000 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/instrumentation.scm (lttng-ust): [phases]: Add absolute-inclusions. * gnu/packages/datastructures.scm (liburcu): [phases]: Add absolute-inclusions. --- gnu/packages/datastructures.scm | 11 +++++++++++ gnu/packages/instrumentation.scm | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm index f247231ecf..042fc8114e 100644 --- a/gnu/packages/datastructures.scm +++ b/gnu/packages/datastructures.scm @@ -26,6 +26,7 @@ (define-module (gnu packages datastructures) #:use-module (gnu packages autotools) #:use-module (gnu packages boost) #:use-module (gnu packages perl) + #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) @@ -146,6 +147,16 @@ (define-public liburcu (base32 "10rh6v9j13622cjlzx31cfpghjy0kqkvn6pb42whwwcg5cyz64rj")))) (build-system gnu-build-system) + (arguments + (list #:imported-modules + `(,@%gnu-build-system-modules (guix build absolute-inclusions)) + #:modules '((guix build gnu-build-system) + (guix build absolute-inclusions) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'absolute-inclusions + patch-header-inclusions)))) (native-inputs (list perl)) ; for tests (home-page "https://liburcu.org/") diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index ab986bfcc7..672189a068 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -215,6 +215,17 @@ (define-public lttng-ust (build-system gnu-build-system) (inputs (list liburcu numactl)) + (arguments + (list + #:imported-modules + `(,@%gnu-build-system-modules (guix build absolute-inclusions)) + #:modules '((guix build gnu-build-system) + (guix build absolute-inclusions) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'absolute-inclusions + patch-header-inclusions)))) (native-inputs (list python-3 pkg-config)) (home-page "https://lttng.org/") -- 2.34.0 From unknown Sat Jun 21 03:30:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54780] [PATCH] gnu: lttng-ust: Fix dependencies. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Apr 2022 09:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54780 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Olivier Dion , 54780@debbugs.gnu.org Received: via spool by 54780-submit@debbugs.gnu.org id=B54780.164949549231894 (code B ref 54780); Sat, 09 Apr 2022 09:12:02 +0000 Received: (at 54780) by debbugs.gnu.org; 9 Apr 2022 09:11:32 +0000 Received: from localhost ([127.0.0.1]:36694 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nd77z-0008IL-Ps for submit@debbugs.gnu.org; Sat, 09 Apr 2022 05:11:32 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:52702) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nd77w-0008Hx-1E for 54780@debbugs.gnu.org; Sat, 09 Apr 2022 05:11:30 -0400 Received: from [192.168.109.254] ([188.189.133.86]) by laurent.telenet-ops.be with bizsmtp id GZBR270061s0Pjw01ZBRAV; Sat, 09 Apr 2022 11:11:26 +0200 Message-ID: <1f20e8a21cd13b25726187ffbf665ecbfb26177e.camel@telenet.be> From: Maxime Devos Date: Sat, 09 Apr 2022 11:11:21 +0200 In-Reply-To: <87lewfuqtk.fsf@laura> References: <3afb4ed9e9446906504f781dcf047160491ddfff.1649377087.git.olivier.dion@polymtl.ca> <871qy7wt52.fsf@laura> <87v8vjvecz.fsf@laura> <7a376302aab455dae361205a491a4e5fd5bd5922.camel@telenet.be> <87o81bv6iz.fsf@laura> <77e920c46bbecdbc2164151b0b194ef86bb54357.camel@telenet.be> <87lewfuqtk.fsf@laura> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-j4l2SNJHJ8/ebhQWi6kn" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1649495486; bh=7qRCwhqa1D+tUCFR4DPu9ReAfNWtOgl7K97uH0iUsIU=; h=Subject:From:To:Date:In-Reply-To:References; b=bPjAvCqlsUoT0z9jgvZt7FqpOKV1pgM8co+c1Toifw+R4F210r0zzf8hjfhUnahf7 qrd/i45EDpbVAvxEBqCpgZeSWo1VQbt2y+DZ9HJT5rBERbs0+WHoOvgoaUUPH80RnH zOFAoTvkrDQjSoAMMbi5BQXFU1h2+Rr+obO3FhtaCgFl2rhHLCB9BLdxhKUYD2P0jx +lVGAlO6yiTQI/l5WJc1T9TZ2MKrn6XLZuVHoaLXb0VZG3MPtlLr9b4DBZF+k5qbEp CJonziu/WhSJS5vuz7nHNgnHWFTTyYWYkH3uJBydTcmdjfykCJ+JcUYmG/fNZlx5sy ma497TrBxf2lA== X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-j4l2SNJHJ8/ebhQWi6kn Content-Type: multipart/mixed; boundary="=-iV2KQaikzClaLgJeV48p" --=-iV2KQaikzClaLgJeV48p Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable user guix usertags 54780 + reviewed-looks-good usertags 49672 + reviewed-looks-good thanks Olivier Dion schreef op vr 08-04-2022 om 18:56 [-0400]: > On Fri, 08 Apr 2022, Maxime Devos wrote: > > Olivier Dion schreef op vr 08-04-2022 om 13:17 [-0400]: > > =C2=A0=C2=A0 * add absolute-inclusions.scm to the Guix repo, in guix/bu= ild > > =C2=A0=C2=A0 * modify liburcu to: > >=20 > > =C2=A0=C2=A0 (package > > =C2=A0=C2=A0=C2=A0=C2=A0 (name "liburcu") > > =C2=A0=C2=A0=C2=A0=C2=A0 [...] > > =C2=A0=C2=A0=C2=A0=C2=A0 (arguments > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (list #:imported-modules `(,@%gnu-= build-system-modules (guix build absolute-inclusions)) > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 #:modules '((guix build gnu-build-system) > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= (guix build absolute-inclusions)) > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 #:phases > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 #~(modify-phases %standard-phases > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0 (add-after 'install 'absolute-inclusions > > =C2=A0=C2=A0 absolute-inclusions))))) >=20 > So I have a patch that incorporate your proposal (see next response). > However, I have to add the absolute-inclusions phases for both liburcu > and lttng-ust. Right, lttng-ust can be used by other packages. There were some unaddressed TODOs in absolute-inclusions.scm, the attached absolute-icnlusion.scm addresses them. But aside from that, it looks good to me. FWIW, I can confirm that lttng-tools builds. Greetings, Maxime. --=-iV2KQaikzClaLgJeV48p Content-Disposition: attachment; filename="absolute-inclusions.scm" Content-Type: text/x-scheme; name="absolute-inclusions.scm"; charset="UTF-8" Content-Transfer-Encoding: base64 Ozs7IEdOVSBHdWl4IC0tLSBGdW5jdGlvbmFsIHBhY2thZ2UgbWFuYWdlbWVudCBmb3IgR05VCjs7 OyBDb3B5cmlnaHQgwqkgMjAyMiBNYXhpbWUgRGV2b3MgPG1heGltZWRldm9zQHRlbGVuZXQuYmU+ Cjs7OyBDb3B5cmlnaHQgwqkgMjAyMiBPbGl2aWVyIERpb24gPG9saXZpZXIuZGlvbkBwb2x5bXRs LmNhPgo7OzsKOzs7IFRoaXMgZmlsZSBpcyBwYXJ0IG9mIEdOVSBHdWl4Lgo7OzsKOzs7IEdOVSBH dWl4IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vciBtb2Rp ZnkgaXQKOzs7IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vu c2UgYXMgcHVibGlzaGVkIGJ5Cjs7OyB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRo ZXIgdmVyc2lvbiAzIG9mIHRoZSBMaWNlbnNlLCBvciAoYXQKOzs7IHlvdXIgb3B0aW9uKSBhbnkg bGF0ZXIgdmVyc2lvbi4KOzs7Cjs7OyBHTlUgR3VpeCBpcyBkaXN0cmlidXRlZCBpbiB0aGUgaG9w ZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLCBidXQKOzs7IFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3 aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKOzs7IE1FUkNIQU5UQUJJTElUWSBv ciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUKOzs7IEdOVSBHZW5l cmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMuCjs7Owo7OzsgWW91IHNob3VsZCBo YXZlIHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UKOzs7 IGFsb25nIHdpdGggR05VIEd1aXguICBJZiBub3QsIHNlZSA8aHR0cDovL3d3dy5nbnUub3JnL2xp Y2Vuc2VzLz4uCgooZGVmaW5lLW1vZHVsZSAoZ3VpeCBidWlsZCBhYnNvbHV0ZS1pbmNsdXNpb25z KQogICM6dXNlLW1vZHVsZSAoZ3VpeCBidWlsZCB1dGlscykKICAjOnVzZS1tb2R1bGUgKGljZS05 IG1hdGNoKQogICM6dXNlLW1vZHVsZSAocm5ycyBleGNlcHRpb25zKQogICM6ZXhwb3J0IChhYnNv bHV0ZS1pbmNsdXNpb25zIHBhdGNoLWhlYWRlci1pbmNsdXNpb25zKSkKCihkZWZpbmUgKGV4Y2x1 ZGVkLWlucHV0PyBpbnB1dCkKICA7OyBFeGNsdWRlIGdsaWJjIHRvIGF2b2lkIGluY3JlYXNpbmcg dGhlIGNsb3N1cmUgc2l6ZSB3aGVuIGEKICA7OyBzdGF0aWMgbGlicmFyeSArIGJpbmFyeSBpcyBi dWlsZC4gIExpa2V3aXNlLCBleGNsdWRlCiAgOzsgbGludXgtbGlicmUtaGVhZGVycy4KICAobWF0 Y2ggaW5wdXQKICAgICgoXyAuIHN0b3JlLWl0ZW0pCiAgICAgKG9yIChmaWxlLWV4aXN0cz8gKHN0 cmluZy1hcHBlbmQgc3RvcmUtaXRlbSAiL2luY2x1ZGUvc3RkbGliLmgiKSkKICAgICAgICAgKGRp cmVjdG9yeS1leGlzdHM/IChzdHJpbmctYXBwZW5kIHN0b3JlLWl0ZW0gIi9pbmNsdWRlL2xpbnV4 IikpKSkpKQoKKGRlZmluZSAoYWJzb2x1dGUtaW5jbHVzaW9ucyBmaWxlcyBoZWFkZXItbG9jYXRp b25zKQogIChzdWJzdGl0dXRlKiBmaWxlcwogICAgKCgiXlsgXHRdKiNbIFx0XSppbmNsdWRlWyBc dF0qPCguKik+WyBcdF0qIiBvcmlnaW5hbCBoZWFkZXItbmFtZSkKICAgICAoZ3VhcmQgKGMgKChz ZWFyY2gtZXJyb3I/IGMpIG9yaWdpbmFsKSkKICAgICAgIChmb3JtYXQgI2YgIiNpbmNsdWRlIDx+ YT4iCiAgICAgICAgICAgICAgIChwayAnZm9vIChzZWFyY2gtaW5wdXQtZmlsZSBoZWFkZXItbG9j YXRpb25zCiAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCAiaW5jbHVkZS8iIGhlYWRlci1u YW1lKSkpKSkpKSkKCihkZWZpbmUgaGVhZGVyLWZpbGU/CiAgOzsgU2VlIGdjYygxKSBmb3IgdGhl IGxpc3Qgb2Ygc3VmZml4ZXMuCiAgKGxldCAoKHN1ZmZpeGVzIChsaXN0ICJoIiAiaGgiICJIIiAi aHAiICJoeHgiICJocHAiICJIUFAiICJoKysiICJ0Y2MiKSkpCiAgICAoZmlsZS1uYW1lLXByZWRp Y2F0ZQogICAgIChmb3JtYXQgI2YgIlxcLih+YSkkIiAoc3RyaW5nLWpvaW4gc3VmZml4ZXMgInwi ICdpbmZpeCkpKSkpCgooZGVmaW5lKiAocGF0Y2gtaGVhZGVyLWluY2x1c2lvbnMgIzprZXkgaW5w dXRzIG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQogICJQYXRjaCBpbmNsdXNpb25zIGluIEMg aGVhZGVycyBpbiBPVVRQVVRTIHRvIHVzZSBhYnNvbHV0ZSBmaWxlIG5hbWVzLiIKICAoZGVmaW5l IGhlYWRlci1sb2NhdGlvbnMKICAgIChmaWx0ZXIgKG5lZ2F0ZSBleGNsdWRlZC1pbnB1dD8pIChh cHBlbmQgb3V0cHV0cyBpbnB1dHMpKSkKICAoZm9yLWVhY2ggKG1hdGNoLWxhbWJkYQogICAgICAg ICAgICAgICgoXyAuIG91dHB1dCkKICAgICAgICAgICAgICAgKGFic29sdXRlLWluY2x1c2lvbnMK ICAgICAgICAgICAgICAgIChmaW5kLWZpbGVzIChzdHJpbmctYXBwZW5kIG91dHB1dCAiL2luY2x1 ZGUiKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgaGVhZGVyLWZpbGU/KQogICAgICAgICAg ICAgICAgaGVhZGVyLWxvY2F0aW9ucykpKQogICAgICAgICAgICBvdXRwdXRzKSkK --=-iV2KQaikzClaLgJeV48p-- --=-j4l2SNJHJ8/ebhQWi6kn Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYlFNuRccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7kH/AP49QhuMBxyf0OEqkUYS4Y+yEY9I LpXXlWnAaENB+01exwEAtzZaramf6cWpwAL9zJgSiIvjEufQpdOqPosrGtXjwA4= =liXG -----END PGP SIGNATURE----- --=-j4l2SNJHJ8/ebhQWi6kn-- From unknown Sat Jun 21 03:30:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54780] [PATCH] gnu: lttng-ust: Fix dependencies. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Apr 2022 09:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54780 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Olivier Dion , 54780@debbugs.gnu.org Received: via spool by 54780-submit@debbugs.gnu.org id=B54780.164949562032147 (code B ref 54780); Sat, 09 Apr 2022 09:14:01 +0000 Received: (at 54780) by debbugs.gnu.org; 9 Apr 2022 09:13:40 +0000 Received: from localhost ([127.0.0.1]:36707 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nd7A3-0008MQ-Id for submit@debbugs.gnu.org; Sat, 09 Apr 2022 05:13:39 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:55288) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nd7A1-0008MI-HV for 54780@debbugs.gnu.org; Sat, 09 Apr 2022 05:13:37 -0400 Received: from [192.168.109.254] ([188.189.133.86]) by laurent.telenet-ops.be with bizsmtp id GZDc270081s0Pjw01ZDcUq; Sat, 09 Apr 2022 11:13:36 +0200 Message-ID: From: Maxime Devos Date: Sat, 09 Apr 2022 11:13:04 +0200 In-Reply-To: <1f20e8a21cd13b25726187ffbf665ecbfb26177e.camel@telenet.be> References: <3afb4ed9e9446906504f781dcf047160491ddfff.1649377087.git.olivier.dion@polymtl.ca> <871qy7wt52.fsf@laura> <87v8vjvecz.fsf@laura> <7a376302aab455dae361205a491a4e5fd5bd5922.camel@telenet.be> <87o81bv6iz.fsf@laura> <77e920c46bbecdbc2164151b0b194ef86bb54357.camel@telenet.be> <87lewfuqtk.fsf@laura> <1f20e8a21cd13b25726187ffbf665ecbfb26177e.camel@telenet.be> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-iV4FH4Pg2TPKXt7/vu1h" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1649495616; bh=3Cyy03mNUwhdPQdS15EOeJI3ROHU39mNRLKG9M0UC0U=; h=Subject:From:To:Date:In-Reply-To:References; b=JH/l/MOImX/oWnijwtYNkntp1J3Owb91lM4mf0DwiP1lhdYAyLDwowVjSp8DqgNDD nGPYRtD9qOgsGrRsHrRWdPq2CCXkS8BWWKrhfh0UTZp2NFBHT19UP5L5NX8gd+8tt+ X+UTvOoiPcBOyKcfmN8ztJl+4N/+MclwRtg5ZbKWzJdX5geqW+99pFPSgaaPCiyVBo TvypJc9vx3Rr1eOKT1GqFYk9xkOwK9ZnSwpObTsfBz5AEuWVv3HzFvUY+OtQ2ck0wE 6rtb478DcSo0QaxgrhHybME5eYidGRKlzUVHyYXOHK7Yr01uJX5aoFzc43JJKiurXP 80RixEyRruwVQ== X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-iV4FH4Pg2TPKXt7/vu1h Content-Type: multipart/mixed; boundary="=-dbnwrnIc7/Yke/D27oPX" --=-dbnwrnIc7/Yke/D27oPX Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Maxime Devos schreef op za 09-04-2022 om 11:11 [+0200]: > Right, lttng-ust can be used by other packages. > There were some unaddressed TODOs in absolute-inclusions.scm, the > attached absolute-icnlusion.scm addresses them.=C2=A0 But aside from that= , Oops I forgot to remove the 'pk' --=-dbnwrnIc7/Yke/D27oPX Content-Description: Content-Disposition: inline; filename="absolute-inclusions.scm" Content-Transfer-Encoding: base64 Content-Type: text/x-scheme; name="absolute-inclusions.scm"; charset="UTF-8" Ozs7IEdOVSBHdWl4IC0tLSBGdW5jdGlvbmFsIHBhY2thZ2UgbWFuYWdlbWVudCBmb3IgR05VCjs7 OyBDb3B5cmlnaHQgwqkgMjAyMiBNYXhpbWUgRGV2b3MgPG1heGltZWRldm9zQHRlbGVuZXQuYmU+ Cjs7OyBDb3B5cmlnaHQgwqkgMjAyMiBPbGl2aWVyIERpb24gPG9saXZpZXIuZGlvbkBwb2x5bXRs LmNhPgo7OzsKOzs7IFRoaXMgZmlsZSBpcyBwYXJ0IG9mIEdOVSBHdWl4Lgo7OzsKOzs7IEdOVSBH dWl4IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vciBtb2Rp ZnkgaXQKOzs7IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vu c2UgYXMgcHVibGlzaGVkIGJ5Cjs7OyB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRo ZXIgdmVyc2lvbiAzIG9mIHRoZSBMaWNlbnNlLCBvciAoYXQKOzs7IHlvdXIgb3B0aW9uKSBhbnkg bGF0ZXIgdmVyc2lvbi4KOzs7Cjs7OyBHTlUgR3VpeCBpcyBkaXN0cmlidXRlZCBpbiB0aGUgaG9w ZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLCBidXQKOzs7IFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3 aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKOzs7IE1FUkNIQU5UQUJJTElUWSBv ciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUKOzs7IEdOVSBHZW5l cmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMuCjs7Owo7OzsgWW91IHNob3VsZCBo YXZlIHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UKOzs7 IGFsb25nIHdpdGggR05VIEd1aXguICBJZiBub3QsIHNlZSA8aHR0cDovL3d3dy5nbnUub3JnL2xp Y2Vuc2VzLz4uCgooZGVmaW5lLW1vZHVsZSAoZ3VpeCBidWlsZCBhYnNvbHV0ZS1pbmNsdXNpb25z KQogICM6dXNlLW1vZHVsZSAoZ3VpeCBidWlsZCB1dGlscykKICAjOnVzZS1tb2R1bGUgKGljZS05 IG1hdGNoKQogICM6dXNlLW1vZHVsZSAocm5ycyBleGNlcHRpb25zKQogICM6ZXhwb3J0IChhYnNv bHV0ZS1pbmNsdXNpb25zIHBhdGNoLWhlYWRlci1pbmNsdXNpb25zKSkKCihkZWZpbmUgKGV4Y2x1 ZGVkLWlucHV0PyBpbnB1dCkKICA7OyBFeGNsdWRlIGdsaWJjIHRvIGF2b2lkIGluY3JlYXNpbmcg dGhlIGNsb3N1cmUgc2l6ZSB3aGVuIGEKICA7OyBzdGF0aWMgbGlicmFyeSArIGJpbmFyeSBpcyBi dWlsZC4gIExpa2V3aXNlLCBleGNsdWRlCiAgOzsgbGludXgtbGlicmUtaGVhZGVycy4KICAobWF0 Y2ggaW5wdXQKICAgICgoXyAuIHN0b3JlLWl0ZW0pCiAgICAgKG9yIChmaWxlLWV4aXN0cz8gKHN0 cmluZy1hcHBlbmQgc3RvcmUtaXRlbSAiL2luY2x1ZGUvc3RkbGliLmgiKSkKICAgICAgICAgKGRp cmVjdG9yeS1leGlzdHM/IChzdHJpbmctYXBwZW5kIHN0b3JlLWl0ZW0gIi9pbmNsdWRlL2xpbnV4 IikpKSkpKQoKKGRlZmluZSAoYWJzb2x1dGUtaW5jbHVzaW9ucyBmaWxlcyBoZWFkZXItbG9jYXRp b25zKQogIChzdWJzdGl0dXRlKiBmaWxlcwogICAgKCgiXlsgXHRdKiNbIFx0XSppbmNsdWRlWyBc dF0qPCguKik+WyBcdF0qIiBvcmlnaW5hbCBoZWFkZXItbmFtZSkKICAgICAoZ3VhcmQgKGMgKChz ZWFyY2gtZXJyb3I/IGMpIG9yaWdpbmFsKSkKICAgICAgIChmb3JtYXQgI2YgIiNpbmNsdWRlIDx+ YT4iCiAgICAgICAgICAgICAgIChzZWFyY2gtaW5wdXQtZmlsZSBoZWFkZXItbG9jYXRpb25zCiAg ICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCAiaW5jbHVkZS8iIGhlYWRlci1uYW1lKSkpKSkp KQoKKGRlZmluZSBoZWFkZXItZmlsZT8KICA7OyBTZWUgZ2NjKDEpIGZvciB0aGUgbGlzdCBvZiBz dWZmaXhlcy4KICAobGV0ICgoc3VmZml4ZXMgKGxpc3QgImgiICJoaCIgIkgiICJocCIgImh4eCIg ImhwcCIgIkhQUCIgImgrKyIgInRjYyIpKSkKICAgIChmaWxlLW5hbWUtcHJlZGljYXRlCiAgICAg KGZvcm1hdCAjZiAiXFwuKH5hKSQiIChzdHJpbmctam9pbiBzdWZmaXhlcyAifCIgJ2luZml4KSkp KSkKCihkZWZpbmUqIChwYXRjaC1oZWFkZXItaW5jbHVzaW9ucyAjOmtleSBpbnB1dHMgb3V0cHV0 cyAjOmFsbG93LW90aGVyLWtleXMpCiAgIlBhdGNoIGluY2x1c2lvbnMgaW4gQyBoZWFkZXJzIGlu IE9VVFBVVFMgdG8gdXNlIGFic29sdXRlIGZpbGUgbmFtZXMuIgogIChkZWZpbmUgaGVhZGVyLWxv Y2F0aW9ucwogICAgKGZpbHRlciAobmVnYXRlIGV4Y2x1ZGVkLWlucHV0PykgKGFwcGVuZCBvdXRw dXRzIGlucHV0cykpKQogIChmb3ItZWFjaCAobWF0Y2gtbGFtYmRhCiAgICAgICAgICAgICAgKChf IC4gb3V0cHV0KQogICAgICAgICAgICAgICAoYWJzb2x1dGUtaW5jbHVzaW9ucwogICAgICAgICAg ICAgICAgKGZpbmQtZmlsZXMgKHN0cmluZy1hcHBlbmQgb3V0cHV0ICIvaW5jbHVkZSIpCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICBoZWFkZXItZmlsZT8pCiAgICAgICAgICAgICAgICBoZWFk ZXItbG9jYXRpb25zKSkpCiAgICAgICAgICAgIG91dHB1dHMpKQo= --=-dbnwrnIc7/Yke/D27oPX-- --=-iV4FH4Pg2TPKXt7/vu1h Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYlFOIBccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7ttMAP9JLy1vTeF3cRMY54dOVWQdUfCt 1S4HCsETBFe6VgS1rQD/TBnMFuYZ2zvJiQsbHZuzmw74f4P0woZ7dMgiWu6CKwk= =HM07 -----END PGP SIGNATURE----- --=-iV4FH4Pg2TPKXt7/vu1h-- From unknown Sat Jun 21 03:30:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54780] [PATCH] gnu: lttng-ust: Fix dependencies. Resent-From: Olivier Dion Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Apr 2022 14:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54780 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos , 54780@debbugs.gnu.org Received: via spool by 54780-submit@debbugs.gnu.org id=B54780.16495152149971 (code B ref 54780); Sat, 09 Apr 2022 14:41:02 +0000 Received: (at 54780) by debbugs.gnu.org; 9 Apr 2022 14:40:14 +0000 Received: from localhost ([127.0.0.1]:38413 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ndCG6-0002al-I0 for submit@debbugs.gnu.org; Sat, 09 Apr 2022 10:40:14 -0400 Received: from smtp.polymtl.ca ([132.207.4.11]:33789) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ndCG5-0002aS-AL for 54780@debbugs.gnu.org; Sat, 09 Apr 2022 10:40:13 -0400 Received: from localhost (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 239Ee2dD006558 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 9 Apr 2022 10:40:07 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 239Ee2dD006558 From: Olivier Dion In-Reply-To: References: <3afb4ed9e9446906504f781dcf047160491ddfff.1649377087.git.olivier.dion@polymtl.ca> <871qy7wt52.fsf@laura> <87v8vjvecz.fsf@laura> <7a376302aab455dae361205a491a4e5fd5bd5922.camel@telenet.be> <87o81bv6iz.fsf@laura> <77e920c46bbecdbc2164151b0b194ef86bb54357.camel@telenet.be> <87lewfuqtk.fsf@laura> <1f20e8a21cd13b25726187ffbf665ecbfb26177e.camel@telenet.be> Date: Sat, 09 Apr 2022 10:40:02 -0400 Message-ID: <87fsmmuxq5.fsf@laura> MIME-Version: 1.0 Content-Type: text/plain X-Poly-FromMTA: (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) at Sat, 9 Apr 2022 14:40:02 +0000 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) On Sat, 09 Apr 2022, Maxime Devos wrote: > Maxime Devos schreef op za 09-04-2022 om 11:11 [+0200]: > (define (excluded-input? input) > (directory-exists? (string-append store-item > "/include/linux")))))) I'm not sure if that's okay. What if the package require kernel's headers? Would this works if testing a custom kernel? I assume that for glibc that's okay because the toolchain was built with '--with-native-system-header-dir=DIRNAME' or something like that. -- Olivier Dion oldiob.dev From unknown Sat Jun 21 03:30:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54780] [PATCH] gnu: lttng-ust: Fix dependencies. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Apr 2022 16:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54780 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Olivier Dion , 54780@debbugs.gnu.org Received: via spool by 54780-submit@debbugs.gnu.org id=B54780.164952011118143 (code B ref 54780); Sat, 09 Apr 2022 16:02:02 +0000 Received: (at 54780) by debbugs.gnu.org; 9 Apr 2022 16:01:51 +0000 Received: from localhost ([127.0.0.1]:38536 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ndDX5-0004iZ-Ee for submit@debbugs.gnu.org; Sat, 09 Apr 2022 12:01:51 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:44000) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ndDX3-0004iQ-AV for 54780@debbugs.gnu.org; Sat, 09 Apr 2022 12:01:50 -0400 Received: from [192.168.109.254] ([178.119.10.153]) by andre.telenet-ops.be with bizsmtp id Gg1m2700J3J72EA01g1n03; Sat, 09 Apr 2022 18:01:47 +0200 Message-ID: From: Maxime Devos Date: Sat, 09 Apr 2022 18:01:42 +0200 In-Reply-To: <87fsmmuxq5.fsf@laura> References: <3afb4ed9e9446906504f781dcf047160491ddfff.1649377087.git.olivier.dion@polymtl.ca> <871qy7wt52.fsf@laura> <87v8vjvecz.fsf@laura> <7a376302aab455dae361205a491a4e5fd5bd5922.camel@telenet.be> <87o81bv6iz.fsf@laura> <77e920c46bbecdbc2164151b0b194ef86bb54357.camel@telenet.be> <87lewfuqtk.fsf@laura> <1f20e8a21cd13b25726187ffbf665ecbfb26177e.camel@telenet.be> <87fsmmuxq5.fsf@laura> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-YnQEYMj6JaejqCw6nRTu" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1649520107; bh=AYKX+bfE6M3whPve8E6eZvh5sEiimNIbD4A8dZkbKOA=; h=Subject:From:To:Date:In-Reply-To:References; b=BR1jE33ES/IO+A1HewZiuNFQbmVRuTWARr/NJwwELLT3Qh+UD+9SHLrF57QhmWgyn TlrQeWlRKOEGW/CMTmBZN91supOFTBPr/FMjTXq7kuzYQp9Fk4k0PM7yuY3S4J4Lzh 2o1t/dUIHX1v7fpaBuF14VfK1m6eBezhW6Y1ATV2yTsOuRm5qW9nBsMxFDajgq45RQ dScrDHHW7XsluJbepFYxUzmexpcM6cfSKg5iQ0QXbWng1qpRvhCnHm1QggYQPTplx9 IwEULMry5uAHvuEkYiwxJnv5e99RvUJY3tmLMF0XQYGtRh3kZ/yhVyn9li7+u3GuC+ ycK0486oW+2mg== X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-YnQEYMj6JaejqCw6nRTu Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Olivier Dion schreef op za 09-04-2022 om 10:40 [-0400]: > On Sat, 09 Apr 2022, Maxime Devos wrote: > > Maxime Devos schreef op za 09-04-2022 om 11:11 [+0200]: > > (define (excluded-input? input) > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (directory-exist= s? (string-append store-item > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "/include/linux"= )))))) > [...] > I assume that for glibc that's okay because the toolchain was built with > '--with-native-system-header-dir=3DDIRNAME' or something like that. Some remarks: * Let 'foo' be a program depending on the C library 'bar' whose headers include some headers from 'linux-libre-headers' and 'glibc'. * Almost every C program includes some headers of glibc anyway, so to compile the C program 'foo', you would need to have a glibc in the environment anyway, so absoluting the references to glibc headers doesn't bring much here. * Even then, as you say, the toolchain is compiled with something like that. > I'm not sure if that's okay. What if the package require kernel's > headers? Would this works if testing a custom kernel? *=C2=A0Looking at the existence of $GUIX_ENVIRONMENT/include/linux when doing "guix shell -D hello --pure", it looks like (a slightly old version of) linux-libre-headers is included by default in the build environment, so the package will have some kernel headers automatically. * Suppose that=C2=A0'linux-libre-headers' was not excluded. Suppose that 'bar' depends on 'linux-libre-headers', and hence some inclusions were absolutised. Now suppose that 'foo' requires a _newer_ linux-libre-headers, say linux-libre-headers@5.15 to utilise some fancy new thing in Linux. Suppose the source code is something like: foo.c: #include #include --> absolutised to bar.h: [standard include guard] #include ---> absolutised to [standard include guard] linux/stuff.h [standard include guard] [stuff depending on the linux-libre-headers version] [standard include guard] Then, what would happen when 'foo.c', is that at first, the C compiler loads . It sees that old-linux/stuff.h and loads it, including the include guard. The next thing it sees is #include . But then the compiler (mis)remembers, due to the include guard, that it included this header already, so it will not include the _new_ As such, foo.c would end up with the _old_ , even though it needed the new stuff (new structs or such). By not absolutising the , the compiler will just look for in C_INCLUDE_P= ATH, and find the linux-libre-headers from lttng-ust's inputs. So I'm a bit hesitant to including linux-libre-headers. Greetings, Maxime. --=-YnQEYMj6JaejqCw6nRTu Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYlGt5hccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7vOZAQDZEQJ1wURMRNvCNjZOKjLC+PP+ RAIydYbxteulItTHoQEAnj8JCDrKpEGvWrswtS7zAKzHmavcDziiT6hdy24LZwo= =dZ7g -----END PGP SIGNATURE----- --=-YnQEYMj6JaejqCw6nRTu-- From unknown Sat Jun 21 03:30:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54780] [PATCH] gnu: lttng-ust: Fix dependencies. Resent-From: Olivier Dion Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Apr 2022 16:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54780 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos , 54780@debbugs.gnu.org Received: via spool by 54780-submit@debbugs.gnu.org id=B54780.164952209921385 (code B ref 54780); Sat, 09 Apr 2022 16:35:01 +0000 Received: (at 54780) by debbugs.gnu.org; 9 Apr 2022 16:34:59 +0000 Received: from localhost ([127.0.0.1]:38601 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ndE38-0005Yr-Tx for submit@debbugs.gnu.org; Sat, 09 Apr 2022 12:34:59 -0400 Received: from smtp.polymtl.ca ([132.207.4.11]:47734) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ndE36-0005Yc-J7 for 54780@debbugs.gnu.org; Sat, 09 Apr 2022 12:34:57 -0400 Received: from localhost (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 239GYknK017640 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 9 Apr 2022 12:34:50 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 239GYknK017640 From: Olivier Dion In-Reply-To: References: <3afb4ed9e9446906504f781dcf047160491ddfff.1649377087.git.olivier.dion@polymtl.ca> <871qy7wt52.fsf@laura> <87v8vjvecz.fsf@laura> <7a376302aab455dae361205a491a4e5fd5bd5922.camel@telenet.be> <87o81bv6iz.fsf@laura> <77e920c46bbecdbc2164151b0b194ef86bb54357.camel@telenet.be> <87lewfuqtk.fsf@laura> <1f20e8a21cd13b25726187ffbf665ecbfb26177e.camel@telenet.be> <87fsmmuxq5.fsf@laura> Date: Sat, 09 Apr 2022 12:34:45 -0400 Message-ID: <87czhqusey.fsf@laura> MIME-Version: 1.0 Content-Type: text/plain X-Poly-FromMTA: (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) at Sat, 9 Apr 2022 16:34:46 +0000 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) On Sat, 09 Apr 2022, Maxime Devos wrote: > Olivier Dion schreef op za 09-04-2022 om 10:40 [-0400]: >> On Sat, 09 Apr 2022, Maxime Devos wrote: > As such, foo.c would end up with the _old_ , even though > it needed the new stuff (new structs or such). By not absolutising the > , the compiler will just look for in C_INCLUDE_PATH, > and find the linux-libre-headers from lttng-ust's inputs. > > So I'm a bit hesitant to including linux-libre-headers. Following your example, I now think it's best to not include the linux headers in that case. Time will tell if there's some very specific case where the opposite is true. I'll post a v3 with your proposed changes. -- Olivier Dion oldiob.dev From unknown Sat Jun 21 03:30:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54780] [PATCH v3 2/2] gnu: packages: Use absolute headers inclusion. Resent-From: Olivier Dion Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 21 Apr 2022 16:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54780 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Olivier Dion , Maxime Devos , 54780@debbugs.gnu.org Received: via spool by 54780-submit@debbugs.gnu.org id=B54780.165055960025376 (code B ref 54780); Thu, 21 Apr 2022 16:47:01 +0000 Received: (at 54780) by debbugs.gnu.org; 21 Apr 2022 16:46:40 +0000 Received: from localhost ([127.0.0.1]:50871 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhZx1-0006bC-Sp for submit@debbugs.gnu.org; Thu, 21 Apr 2022 12:46:40 -0400 Received: from smtp.polymtl.ca ([132.207.4.11]:55868) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhZx0-0006ar-Ep for 54780@debbugs.gnu.org; Thu, 21 Apr 2022 12:46:38 -0400 Received: from laura.hitronhub.home (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 23LGkKu3010843 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Thu, 21 Apr 2022 12:46:32 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 23LGkKu3010843 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1650559592; bh=VAa98XXZ6ACM7P1OVoWEK3NCApscD9YuMBf/VaO4fP4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Uw2Vb3NiDTaPyZjEXYe0Y+UKttx4IGq0AcF8ig9VLHOzMuzMa9IkAK7TTCcWRPxb+ Vnfif4fG+73ro7VYmlanOzmTRhnlqkHGAHv1xv0Xuls5A1CmMe4+3iQq3CvZ+YrAND 6VCV0K/OXnoK6B9xZLDquE0GL6Lnf1gQqXSSr64I= From: Olivier Dion Date: Thu, 21 Apr 2022 12:46:19 -0400 Message-Id: <2840658be9d631e3bda8df14c1b70d0766bfe61e.1650559513.git.olivier.dion@polymtl.ca> X-Mailer: git-send-email 2.35.1 In-Reply-To: <4b19827ee0d266ecd80dc7c5d776f3ffd764a575.1649459701.git.olivier.dion@polymtl.ca> References: <4b19827ee0d266ecd80dc7c5d776f3ffd764a575.1649459701.git.olivier.dion@polymtl.ca> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Poly-FromMTA: (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) at Thu, 21 Apr 2022 16:46:20 +0000 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/instrumentation.scm (lttng-ust): [phases]: Add absolute-inclusions. * gnu/packages/datastructures.scm (liburcu): [phases]: Add absolute-inclusions. --- gnu/packages/datastructures.scm | 11 +++++++++++ gnu/packages/instrumentation.scm | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm index f247231ecf..042fc8114e 100644 --- a/gnu/packages/datastructures.scm +++ b/gnu/packages/datastructures.scm @@ -26,6 +26,7 @@ (define-module (gnu packages datastructures) #:use-module (gnu packages autotools) #:use-module (gnu packages boost) #:use-module (gnu packages perl) + #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) @@ -146,6 +147,16 @@ (define-public liburcu (base32 "10rh6v9j13622cjlzx31cfpghjy0kqkvn6pb42whwwcg5cyz64rj")))) (build-system gnu-build-system) + (arguments + (list #:imported-modules + `(,@%gnu-build-system-modules (guix build absolute-inclusions)) + #:modules '((guix build gnu-build-system) + (guix build absolute-inclusions) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'absolute-inclusions + patch-header-inclusions)))) (native-inputs (list perl)) ; for tests (home-page "https://liburcu.org/") diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index ab986bfcc7..672189a068 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -215,6 +215,17 @@ (define-public lttng-ust (build-system gnu-build-system) (inputs (list liburcu numactl)) + (arguments + (list + #:imported-modules + `(,@%gnu-build-system-modules (guix build absolute-inclusions)) + #:modules '((guix build gnu-build-system) + (guix build absolute-inclusions) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'absolute-inclusions + patch-header-inclusions)))) (native-inputs (list python-3 pkg-config)) (home-page "https://lttng.org/") -- 2.35.1 From unknown Sat Jun 21 03:30:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54780] [PATCH v3 1/2] guix: build: Add absolute-inclusions.scm. Resent-From: Olivier Dion Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 21 Apr 2022 16:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54780 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Olivier Dion , Maxime Devos , 54780@debbugs.gnu.org Received: via spool by 54780-submit@debbugs.gnu.org id=B54780.165055960025383 (code B ref 54780); Thu, 21 Apr 2022 16:47:01 +0000 Received: (at 54780) by debbugs.gnu.org; 21 Apr 2022 16:46:40 +0000 Received: from localhost ([127.0.0.1]:50873 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhZx2-0006bF-5l for submit@debbugs.gnu.org; Thu, 21 Apr 2022 12:46:40 -0400 Received: from smtp.polymtl.ca ([132.207.4.11]:45305) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhZwz-0006an-Tw for 54780@debbugs.gnu.org; Thu, 21 Apr 2022 12:46:38 -0400 Received: from laura.hitronhub.home (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 23LGkKu2010843 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Thu, 21 Apr 2022 12:46:31 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 23LGkKu2010843 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1650559591; bh=DD9Q7m+L/u10NxJnCR8H9+eVgEJL4wwdYTJimOPhWt0=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ngtsyiBbSK1153aB4MtvHgY4hxUgKQavR+47iNqCjpjPNwPUphjn4TePuzkYqZqFq Kxs58RfGNQ4vI0WbIrBeNjf0GAVf8naWpSWom8J9GfS83SGJKBdNXno9j4rj7xJG9y UoY2kLECDoEaNKN7JiJlg0H/eT4ipbXlMN80dHac= From: Olivier Dion Date: Thu, 21 Apr 2022 12:46:18 -0400 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: <4b19827ee0d266ecd80dc7c5d776f3ffd764a575.1649459701.git.olivier.dion@polymtl.ca> References: <4b19827ee0d266ecd80dc7c5d776f3ffd764a575.1649459701.git.olivier.dion@polymtl.ca> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Poly-FromMTA: (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) at Thu, 21 Apr 2022 16:46:20 +0000 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * guix/build/absolute-inclusions.scm: New file. * Makefile.am (MODULES): Add it here. --- Makefile.am | 1 + guix/build/absolute-inclusions.scm | 59 ++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 guix/build/absolute-inclusions.scm diff --git a/Makefile.am b/Makefile.am index fecce7c6f7..394df67016 100644 --- a/Makefile.am +++ b/Makefile.am @@ -181,6 +181,7 @@ MODULES = \ guix/diagnostics.scm \ guix/ui.scm \ guix/status.scm \ + guix/build/absolute-inclusions.scm \ guix/build/android-ndk-build-system.scm \ guix/build/ant-build-system.scm \ guix/build/download.scm \ diff --git a/guix/build/absolute-inclusions.scm b/guix/build/absolute-inclusions.scm new file mode 100644 index 0000000000..34aecf198a --- /dev/null +++ b/guix/build/absolute-inclusions.scm @@ -0,0 +1,59 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Maxime Devos +;;; Copyright © 2022 Olivier Dion +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix build absolute-inclusions) + #:use-module (guix build utils) + #:use-module (ice-9 match) + #:use-module (rnrs exceptions) + #:export (absolute-inclusions patch-header-inclusions)) + +(define (absolute-inclusions files header-locations) + (substitute* files + (("^[ \t]*#[ \t]*include[ \t]*<(.*)>[ \t]*" original header-name) + (guard (c ((search-error? c) original)) + (format #f "#include <~a>" + (search-input-file header-locations + (string-append "include/" header-name))))))) + +(define header-file? + ;; See gcc(1) for the list of suffixes. + (let ((suffixes (list "h" "hh" "H" "hp" "hxx" "hpp" "HPP" "h++" "tcc"))) + (file-name-predicate + (format #f "\\.(~a)$" (string-join suffixes "|" 'infix))))) + +(define (excluded-input? input) + ;; Exclude glibc to avoid increasing the closure size when a + ;; static library + binary is build. Likewise, exclude + ;; linux-libre-headers. + (match input + ((_ . store-item) + (or (file-exists? (string-append store-item "/include/stdlib.h")) + (directory-exists? (string-append store-item "/include/linux")))))) + +(define* (patch-header-inclusions #:key inputs outputs #:allow-other-keys) + "Patch inclusions in C headers in OUTPUTS to use absolute file names." + (define header-locations + (filter (negate excluded-input?) (append outputs inputs))) + (for-each (match-lambda + ((_ . output) + (absolute-inclusions + (find-files (string-append output "/include") + header-file?) + header-locations))) + outputs)) -- 2.35.1 From unknown Sat Jun 21 03:30:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54780] [PATCH] gnu: lttng-ust: Fix dependencies. Resent-From: Olivier Dion Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 May 2022 20:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54780 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54780@debbugs.gnu.org Cc: Maxime Devos X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16528199231803 (code B ref -1); Tue, 17 May 2022 20:39:02 +0000 Received: (at submit) by debbugs.gnu.org; 17 May 2022 20:38:43 +0000 Received: from localhost ([127.0.0.1]:58150 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nr3xq-0000T1-QE for submit@debbugs.gnu.org; Tue, 17 May 2022 16:38:42 -0400 Received: from lists.gnu.org ([209.51.188.17]:56764) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nr3xn-0000Ss-Kf for submit@debbugs.gnu.org; Tue, 17 May 2022 16:38:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54630) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nr3xn-0004XC-DN for guix-patches@gnu.org; Tue, 17 May 2022 16:38:39 -0400 Received: from smtp.polymtl.ca ([132.207.4.11]:46118) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nr3xk-0000Dw-PR for guix-patches@gnu.org; Tue, 17 May 2022 16:38:38 -0400 Received: from localhost (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 24HKcUFV022695 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 17 May 2022 16:38:34 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 24HKcUFV022695 From: Olivier Dion In-Reply-To: <3afb4ed9e9446906504f781dcf047160491ddfff.1649377087.git.olivier.dion@polymtl.ca> References: <3afb4ed9e9446906504f781dcf047160491ddfff.1649377087.git.olivier.dion@polymtl.ca> Date: Tue, 17 May 2022 16:38:30 -0400 Message-ID: <87bkvvj3nd.fsf@laura> MIME-Version: 1.0 Content-Type: text/plain X-Poly-FromMTA: (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) at Tue, 17 May 2022 20:38:30 +0000 Received-SPF: pass client-ip=132.207.4.11; envelope-from=olivier.dion@polymtl.ca; helo=smtp.polymtl.ca X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Could we have one of the patches merge? Either the first version or the last. lttng-ust is currently broken and setting aside the patch of absolute inclusion of header files, it would be nice to have it work until then. Redards, old -- Olivier Dion oldiob.dev From unknown Sat Jun 21 03:30:02 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Olivier Dion Subject: bug#54780: closed (Re: bug#54780: [PATCH] gnu: lttng-ust: Fix dependencies.) Message-ID: References: <87bkuvvsv5.fsf_-_@gnu.org> <3afb4ed9e9446906504f781dcf047160491ddfff.1649377087.git.olivier.dion@polymtl.ca> X-Gnu-PR-Message: they-closed 54780 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 54780@debbugs.gnu.org Date: Tue, 14 Jun 2022 21:28:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1655242082-11234-1" This is a multi-part message in MIME format... ------------=_1655242082-11234-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #54780: [PATCH] gnu: lttng-ust: Fix dependencies. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 54780@debbugs.gnu.org. --=20 54780: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D54780 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1655242082-11234-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 54780-done) by debbugs.gnu.org; 14 Jun 2022 21:27:08 +0000 Received: from localhost ([127.0.0.1]:35944 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o1E43-0002tk-SK for submit@debbugs.gnu.org; Tue, 14 Jun 2022 17:27:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34586) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o1E40-0002tD-BP for 54780-done@debbugs.gnu.org; Tue, 14 Jun 2022 17:27:06 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:45248) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1E3t-0001lQ-Q7; Tue, 14 Jun 2022 17:26:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=UTXq8t1apx67XhhbWerGOQzCX240Z5QXClEVIAO3Py0=; b=EZKhSS7koEWNc118uCP+ Ok1z6GD2lfxeprwWbYSviHQmbwmjruzXvDp9cpnQQgmfroq1ZzwzpARRP1qjAjUz3qL339CECQMPd v1sb+uGVYy5xKbro3ssuBv9qRFMfJiMN8CUs67iS9/9Tze1IpEtnADGe4apXWM5gc2YHND0BMFv/J 8v1FRU47SmydcJXNoAofYRlQDfTbnSPx0xD/oPjJr7aaqGFN/mS8m9UmPewhXiADDbiLDv3613TyZ 6L0Yvt5AmkjEiikLyRc+tCdYjX4BWCo50AkYbj8pSgaHq2xjo2k53e4gGPbl40M+MOfB2MHgbVcCF 0pgRQ8c/gG4+Ag==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:49576 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1E3t-0007jY-D3; Tue, 14 Jun 2022 17:26:57 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Olivier Dion Subject: Re: bug#54780: [PATCH] gnu: lttng-ust: Fix dependencies. References: <3afb4ed9e9446906504f781dcf047160491ddfff.1649377087.git.olivier.dion@polymtl.ca> <87bkvvj3nd.fsf@laura> Date: Tue, 14 Jun 2022 23:26:54 +0200 In-Reply-To: <87bkvvj3nd.fsf@laura> (Olivier Dion's message of "Tue, 17 May 2022 16:38:30 -0400") Message-ID: <87bkuvvsv5.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 54780-done Cc: 54780-done@debbugs.gnu.org, Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Olivier, Olivier Dion skribis: > Could we have one of the patches merge? Either the first version or the > last. lttng-ust is currently broken and setting aside the patch of > absolute inclusion of header files, it would be nice to have it work > until then. I finally applied the first version. Thanks and apologies for the delay! Ludo=E2=80=99. ------------=_1655242082-11234-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 8 Apr 2022 00:19:05 +0000 Received: from localhost ([127.0.0.1]:33652 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nccLB-0004jB-0k for submit@debbugs.gnu.org; Thu, 07 Apr 2022 20:19:05 -0400 Received: from lists.gnu.org ([209.51.188.17]:53866) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nccL8-0004j3-IF for submit@debbugs.gnu.org; Thu, 07 Apr 2022 20:19:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41086) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nccL8-0003ZR-02 for guix-patches@gnu.org; Thu, 07 Apr 2022 20:19:02 -0400 Received: from smtp.polymtl.ca ([132.207.4.11]:44291) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nccL5-0004GV-Ee for guix-patches@gnu.org; Thu, 07 Apr 2022 20:19:01 -0400 Received: from laura.hitronhub.home (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 2380IjS3008951 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Thu, 7 Apr 2022 20:18:52 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 2380IjS3008951 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1649377132; bh=rHbIPcCZd7IvtQjKk3dBt+IphLBvc/16U4aOPYRMtr4=; h=From:To:Cc:Subject:Date:From; b=dTvwjqkGxWqnBqBOH+L010OuneadFtwIL/lNcArhkjJBACzP/mnUy10gKJHTn5rp1 d/D/6Qto9bWGdZ23BXj3HtQp7M0GTOhxYJ4/W3xTKxw9eTvOB0pW+SVFVFnaxo/PdV mOhnTH4LMcRMRTvSZWa2zTd4m000eO9qjRbrtR+I= From: Olivier Dion To: guix-patches@gnu.org Subject: [PATCH] gnu: lttng-ust: Fix dependencies. Date: Thu, 7 Apr 2022 20:18:44 -0400 Message-Id: <3afb4ed9e9446906504f781dcf047160491ddfff.1649377087.git.olivier.dion@polymtl.ca> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Poly-FromMTA: (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) at Fri, 8 Apr 2022 00:18:45 +0000 Received-SPF: pass client-ip=132.207.4.11; envelope-from=olivier.dion@polymtl.ca; helo=smtp.polymtl.ca X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Olivier Dion X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/packages/instrumentation.scm (lttng-ust): Fix dependencies. [inputs]: Remove liburcu. [propagated-inputs]: Add liburcu. Headers of liburcu are used by headers of lttng. --- gnu/packages/instrumentation.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index ab986bfcc7..45a6872268 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -214,7 +214,9 @@ (define-public lttng-ust "1p7d94r275yvby6zqfxaswdl1q46zxbc8x5rkhnjxrp1d41byrsn")))) (build-system gnu-build-system) (inputs - (list liburcu numactl)) + (list numactl)) + (propagated-inputs + (list liburcu)) (native-inputs (list python-3 pkg-config)) (home-page "https://lttng.org/") -- 2.34.0 ------------=_1655242082-11234-1--