From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 0Lw9FzKJrmUMDgAA62LTzQ:P1 (envelope-from ) for ; Mon, 22 Jan 2024 16:26:42 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 0Lw9FzKJrmUMDgAA62LTzQ (envelope-from ) for ; Mon, 22 Jan 2024 16:26:42 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=o09eKzzj; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1705937202; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=W+GYtfmTdi2wMlY3kJaBCQj4RLXBybsaRgBjkYwroMc=; b=LjBCn1QcQxCobJLlBcbo1zP2B32c8/nGtb9/ZLqam5bqBViD9HaK4xO6msrC305YHh+fKU 14uobyOCxI3qGTjsH9alcNbNE8mGWrmQBWnsDkVxQOUNOl5SoGgfexvVJqcTpamZDAtRkw tHQ9uok5tgZeL1MhNyWq+MUATSSn4hFYXGRxE+E+u8sX+D1UalkMllf6qYs6FIQaIIjQsC gtX70HuhPgx+/EOT/J6PsXadMSkYZgVgn1wUxG5j5MOM14spXmiBHE7cJwtah+9T5pv63K QL+L3X8Il7nwUKTEk4ZIgJdy9H33R19JKzIQp0Coh6/xkq7VSRQriKDRiwRPHQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=o09eKzzj; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1705937202; a=rsa-sha256; cv=none; b=DfdZeRk8zu3KNjDQ0tAp7M9yGaLvZ7+ErRR4yWd0eO5eylEF6DTgF4Lun1oB/1HR4Ji/C8 IOVbIa/2amctn1turahbOTiBjgkx3+P57UiFuv9Ld2YqVEy7z6dtzFlldCP7dddBtMejq7 1m4G5wR15hC3+Ds+BwoWTHw9Nzssysmfs0PUmJpO4CzH864n2CLLOAGhFba84aec8cuh3D VN7p3KZBMSeASjr+ODq4thzlmMIvvOLGHT90EKYNXgMYYgVDoyvjV7WahVcu729mH3O0Cp C2VJW4+OgeHbZJFHmEBJEa0QB0gmp38dEa467/kvekW5QIQp6SFW0l5ZD7g4kQ== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 127831A120 for ; Mon, 22 Jan 2024 16:26:42 +0100 (CET) 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 Content-Transfer-Encoding: 8bit X-Spamd-Bar: / 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 From: Josselin Poiret via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.17 X-Spam-Score: -5.17 X-Migadu-Queue-Id: 127831A120 X-Migadu-Scanner: mx12.migadu.com X-TUID: 7kb+6bQ4omPc 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 -- 2.41.0