diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-08-01 22:21:09 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-08-01 22:21:09 +0200 |
| commit | 8de4131b2ddd11faa3394cf497484563068c9e7a (patch) | |
| tree | ed4ed9e586c7236f09c109afdd416dac18ba8cc3 /gnu/packages/patches/lvm2-static-link.patch | |
| parent | 15406013fe63f2ab238eec2d7a8adbc586806ac8 (diff) | |
| parent | 45b7a8bfda5bde2e2daee4bec0ca092cd719d726 (diff) | |
Merge branch 'master' into emacs-team
Diffstat (limited to 'gnu/packages/patches/lvm2-static-link.patch')
| -rw-r--r-- | gnu/packages/patches/lvm2-static-link.patch | 36 |
1 files changed, 0 insertions, 36 deletions
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@ |