summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-09-10 22:59:27 +0200
committerLudovic Courtès <ludo@gnu.org>2014-09-10 22:59:27 +0200
commitf2817d4303bb21059a6b7980b8aa5b4671d2748f (patch)
treedc5553843c951a7c85ba1d9d53924648d9736362
parenta4888e2e0fb010836930f09a3822580a04fd7e82 (diff)
downloadguix-f2817d4303bb21059a6b7980b8aa5b4671d2748f.tar.gz
gnu: lvm2: Programs such as 'dmsetup' now have a correct RUNPATH.
* gnu/packages/linux.scm (alsa-utils): Add comment.
  (lvm2): Add LDFLAGS as a configure flag.
-rw-r--r--gnu/packages/linux.scm11
1 files changed, 10 insertions, 1 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index fbf70cca55..7be0d076ec 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -613,6 +613,9 @@ MIDI functionality to the Linux-based operating system.")
     (arguments
      ;; XXX: Disable man page creation until we have DocBook.
      '(#:configure-flags (list "--disable-xmlto"
+
+                               ;; The udev rule is responsible for restoring
+                               ;; the volume.
                                (string-append "--with-udev-rules-dir="
                                               (assoc-ref %outputs "out")
                                               "/lib/udev/rules.d"))
@@ -1397,7 +1400,13 @@ time.")
                                               (assoc-ref %outputs "out")
                                               "/etc/lvm")
                                "--enable-udev_sync"
-                               "--enable-udev_rules")
+                               "--enable-udev_rules"
+
+                               ;; Make sure programs such as 'dmsetup' can
+                               ;; find libdevmapper.so.
+                               (string-append "LDFLAGS=-Wl,-rpath="
+                                              (assoc-ref %outputs "out")
+                                              "/lib"))
 
        ;; The tests use 'mknod', which requires root access.
        #:tests? #f))