From patchwork Mon Jan 22 13:36:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 59315 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CD06027BBEA; Mon, 22 Jan 2024 15:26:42 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1D11A27BBE2 for ; Mon, 22 Jan 2024 15:26:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rRwBY-0007Nb-DE; Mon, 22 Jan 2024 10:26:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rRwBU-0007MW-Bz for guix-patches@gnu.org; Mon, 22 Jan 2024 10:26:01 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rRwBU-0005gy-2u for guix-patches@gnu.org; Mon, 22 Jan 2024 10:26:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rRwBX-00072S-PQ; Mon, 22 Jan 2024 10:26:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68656] [PATCH core-updates 6/7] gnu: lvm2-static: Properly handle eudev dependency in pkg-config. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: leo@famulari.name, me@tobias.gr, w@wmeyer.eu, guix-patches@gnu.org Resent-Date: Mon, 22 Jan 2024 15:26:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68656 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68656@debbugs.gnu.org Cc: Josselin Poiret , Leo Famulari , Tobias Geerinckx-Rice , Wilko Meyer X-Debbugs-Original-Xcc: Leo Famulari , Tobias Geerinckx-Rice , Wilko Meyer Received: via spool by 68656-submit@debbugs.gnu.org id=B68656.170593714826983 (code B ref 68656); Mon, 22 Jan 2024 15:26:03 +0000 Received: (at 68656) by debbugs.gnu.org; 22 Jan 2024 15:25:48 +0000 Received: from localhost ([127.0.0.1]:41556 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRwBH-000713-Rs for submit@debbugs.gnu.org; Mon, 22 Jan 2024 10:25:48 -0500 Received: from jpoiret.xyz ([206.189.101.64]:44854) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRwBC-00070S-FM for 68656@debbugs.gnu.org; Mon, 22 Jan 2024 10:25:43 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 95A5118530C; Mon, 22 Jan 2024 15:25:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1705937137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=W+GYtfmTdi2wMlY3kJaBCQj4RLXBybsaRgBjkYwroMc=; b=o09eKzzj/oPKKjFEA15LqemTnMrmzVH6d8jLA+N4znAfVl23cZEoohHqG/lTrd+bMCX2XQ WpEalXGx852wvmND987oF0XlfAaAQba5HMTKZ4S/x4PIxzvKca5/qF/CGAj5Bm2cQvyEmU wcnKCWZRf8LH+DuAGJxRTEC3USEgj1G6S5zcKXdTtmgYje9oWmYH82TGstfpodfnvOTUq7 2SqMCj+2mdyYDN9xNQ4/TAlwMyXGjNqldXi5pMHPezUwpjK0H3d03X/9YMG9ozIawOxu6Y 3AvUe6bcnTkvWVN2o6LF4h3En0bYXVnKTEbmETrTu4l1GBqOVnquoop7O6Z+3Q== Date: Mon, 22 Jan 2024 14:36:22 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Josselin Poiret * gnu/packages/linux.scm (lvm2-static): Add linking flags for the static eudev output. Change-Id: Ic43be600f0569a8ffa69544cbf661f05d82e2084 --- gnu/packages/linux.scm | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2977b8f88e..38a7caf71b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4596,8 +4596,8 @@ (define-public lvm2-static (inherit lvm2) (name "lvm2-static") - ;; Propagate udev because libdevmapper.a depends on libudev. - (propagated-inputs `(("udev:static" ,eudev "static"))) + (inputs `(,@(package-inputs lvm2) + ("udev:static" ,eudev "static"))) (arguments (substitute-keyword-arguments (package-arguments lvm2) @@ -4611,19 +4611,28 @@ (define-public lvm2-static ;; it until the situation improves. (delete "--enable-dmeventd" ,flags))) ((#:phases phases) - `(modify-phases ,phases - (add-before 'configure 'adjust-Makefile - (lambda _ - ;; These fixes are related to the upstream libdm->device_mapper - ;; migration and will hopefully be fixed upstream in due time. - (substitute* "tools/Makefile.in" - ;; This variable is empty in a static configuration and causes - ;; an erroneous GCC command line. - (("-L\\$\\(interfacebuilddir\\)") "") - ;; Remove obsolete reference to libdevmapper.a. - (("-ldevmapper") "")) - #t)))))) - (synopsis "Logical volume management for Linux (statically linked)"))) + #~(modify-phases #$phases + (add-before 'configure 'adjust-Makefile + (lambda _ + ;; These fixes are related to the upstream libdm->device_mapper + ;; migration and will hopefully be fixed upstream in due time. + (substitute* "tools/Makefile.in" + ;; This variable is empty in a static configuration and causes + ;; an erroneous GCC command line. + (("-L\\$\\(interfacebuilddir\\)") "") + ;; Remove obsolete reference to libdevmapper.a. + (("-ldevmapper") "")) + #t)) + (add-after 'install 'adjust-pkgconfig + ;; The static eudev is missing its pkg config file, and I am not + ;; rebuilding it at this point. + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (string-append #$output "/lib/pkgconfig/devmapper.pc") + (("Requires.private: .*") "") + (("Libs.private:") + (format #f "Libs.private: -L~a -ludev" + (dirname (search-input-file inputs "lib/libudev.a"))))))))))) + (synopsis "Logical volume management for Linux (statically linked)"))) (define-public thin-provisioning-tools (package