diff options
| author | Josselin Poiret <dev@jpoiret.xyz> | 2024-01-17 11:52:27 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-08-31 10:44:51 +0200 |
| commit | 80f0228b0e29ddbe097e14464fd66ddf452fffaf (patch) | |
| tree | 175c003c6da973ff5209fc1c86df60779487c3d6 /gnu/packages/linux.scm | |
| parent | b206309b0734ee22f673291b861aeaf5b2907ea0 (diff) | |
| download | guix-80f0228b0e29ddbe097e14464fd66ddf452fffaf.tar.gz guix-80f0228b0e29ddbe097e14464fd66ddf452fffaf.zip | |
gnu: lvm2-static: Properly handle eudev dependency in pkg-config.
* gnu/packages/linux.scm (lvm2-static): Add linking flags for the static eudev
output.
Change-Id: Ic43be600f0569a8ffa69544cbf661f05d82e2084
Diffstat (limited to 'gnu/packages/linux.scm')
| -rw-r--r-- | gnu/packages/linux.scm | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2a7291a796..1188a15a64 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4741,8 +4741,8 @@ mapper. Kernel components are part of Linux-libre.") (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) @@ -4756,19 +4756,28 @@ mapper. Kernel components are part of Linux-libre.") ;; 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 |