diff options
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/linux.scm | 11 | ||||
| -rw-r--r-- | gnu/packages/patches/lvm2-static-link.patch | 36 |
3 files changed, 4 insertions, 44 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index f9d57bbec3..ae2f3dd49f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1570,7 +1570,6 @@ dist_patch_DATA = \ %D%/packages/patches/lua-5.4-pkgconfig.patch \ %D%/packages/patches/lua-5.4-liblua-so.patch \ %D%/packages/patches/luit-posix.patch \ - %D%/packages/patches/lvm2-static-link.patch \ %D%/packages/patches/mactelnet-remove-init.patch \ %D%/packages/patches/mailutils-variable-lookup.patch \ %D%/packages/patches/make-impure-dirs.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index aabbc7fc17..250e26cf09 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4455,7 +4455,7 @@ one to send arbitrary keycodes when a given key is tapped or held.") (define-public lvm2 (package (name "lvm2") - (version "2.03.11") + (version "2.03.21") (source (origin (method url-fetch) (uri (list (string-append "https://sourceware.org/ftp/lvm2/LVM2." @@ -4464,7 +4464,7 @@ one to send arbitrary keycodes when a given key is tapped or held.") version ".tgz"))) (sha256 (base32 - "1m4xpda8vbyd89ca0w8nacvnl4j34yzsa625gn990fb5sh84ab44")) + "0zksqsz8y47kh6vq0ykkgxf19il4wxfn234n6zf8m691sqhij9hy")) (modules '((guix build utils))) (snippet '(begin @@ -4475,9 +4475,7 @@ one to send arbitrary keycodes when a given key is tapped or held.") (("^confdir = .*$") "confdir = @sysconfdir@\n") (("DEFAULT_SYS_DIR = @DEFAULT_SYS_DIR@") - "DEFAULT_SYS_DIR = @sysconfdir@")) - #t)) - (patches (search-patches "lvm2-static-link.patch")))) + "DEFAULT_SYS_DIR = @sysconfdir@")))))) (build-system gnu-build-system) (native-inputs (list config @@ -4503,8 +4501,7 @@ one to send arbitrary keycodes when a given key is tapped or held.") (setenv "SHELL" (which "sh")) ;; Replace /bin/sh with the right file name. - (patch-makefile-SHELL "make.tmpl") - #t))) + (patch-makefile-SHELL "make.tmpl")))) #:configure-flags (list (string-append "--sysconfdir=" (assoc-ref %outputs "out") diff --git a/gnu/packages/patches/lvm2-static-link.patch b/gnu/packages/patches/lvm2-static-link.patch deleted file mode 100644 index 2ade0a1aaa..0000000000 --- a/gnu/packages/patches/lvm2-static-link.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix static linking of 'lvm.static', which indirectly depend on libpthread -and libm via libdevmapper.a. - ---- LVM2.2.02.166/tools/Makefile.in 2016-11-22 21:31:15.521045149 +0100 -+++ LVM2.2.02.166/tools/Makefile.in 2016-11-22 21:31:24.085082767 +0100 -@@ -137,7 +137,7 @@ - lvm.static: $(OBJECTS) lvm-static.o $(LVMINTERNAL_LIBS) - @echo " [CC] $@" - $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ $+ \ -- $(DMEVENT_LIBS) $(STATIC_LIBS) $(LVMLIBS) -+ $(DMEVENT_LIBS) $(STATIC_LIBS) $(LVMLIBS) $(PTHREAD_LIBS) - - liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o - @echo " [AR] $@" ---- a/make.tmpl.in 2018-07-31 22:00:39.969983104 +0200 -+++ b/make.tmpl.in 2018-07-31 22:00:58.467613682 +0200 -@@ -63,7 +63,7 @@ - - LIBS += @LIBS@ $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(RT_LIBS) $(M_LIBS) - # Extra libraries always linked with static binaries --STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) -+STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(M_LIBS) - DEFS += @DEFS@ - # FIXME set this only where it's needed, not globally? - CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@ ---- a/libdm/make.tmpl.in 2018-12-18 15:22:34.000000000 +0100 -+++ b/libdm/make.tmpl.in 2019-01-29 21:45:33.637345799 +0100 -@@ -57,7 +57,7 @@ - LIBS = @LIBS@ - LIBS += $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(RT_LIBS) -lm - # Extra libraries always linked with static binaries --STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) -+STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(PTHREAD_LIBS) $(M_LIBS) - DEFS += @DEFS@ - # FIXME set this only where it's needed, not globally? - CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@ |