ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-08 07:56:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
guix/gnu/packages/patches/lvm2-static-link.patch

37 lines
1.6 KiB
Diff
Raw Normal View History

gnu: Add 'lvm2-static'. * gnu/packages/patches/lvm2-static-link.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/linux.scm (lvm2)[source](patches): New field. (lvm2-static): New variable.
2016-11-22 15:38:40 -05:00
Fix static linking of 'lvm.static', which indirectly depend on libpthread
gnu: lvm2: Fix static build after 62ec02bf21. Fixes <https://bugs.gnu.org/26874>. * gnu/packages/patches/lvm2-static-link.patch: Link with -lm.
2017-05-11 15:30:35 -04:00
and libm via libdevmapper.a.
gnu: Add 'lvm2-static'. * gnu/packages/patches/lvm2-static-link.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/linux.scm (lvm2)[source](patches): New field. (lvm2-static): New variable.
2016-11-22 15:38:40 -05:00
--- 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
gnu: lvm2: Update to 2.03.07. * gnu/packages/linux.scm (lvm2): Update to 2.03.07. [source](snippet): Adjust confdir regex. [inputs]: Add LIBAIO. [arguments]: Add phase 'patch-configure. (lvm2-static)[arguments]: Don't build dmeventd. Add phase 'adjust-Makefile'.
2019-01-31 18:24:38 -05:00
@@ -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)
gnu: Add 'lvm2-static'. * gnu/packages/patches/lvm2-static-link.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/linux.scm (lvm2)[source](patches): New field. (lvm2-static): New variable.
2016-11-22 15:38:40 -05:00
liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
gnu: lvm2: Update to 2.03.07. * gnu/packages/linux.scm (lvm2): Update to 2.03.07. [source](snippet): Adjust confdir regex. [inputs]: Add LIBAIO. [arguments]: Add phase 'patch-configure. (lvm2-static)[arguments]: Don't build dmeventd. Add phase 'adjust-Makefile'.
2019-01-31 18:24:38 -05:00
@echo " [AR] $@"
gnu: lvm2: Fix static linking of dmeventd. Fixes a regression introduced in a3ed69b694eab393129348bbabbed8c59bad3772 where dmeventd.static fails to link against libm and breaks "lvm2-static". * gnu/packages/patches/lvm2-static-link.patch: Patch make.tmpl.in.
2018-07-31 16:18:51 -04:00
--- a/make.tmpl.in 2018-07-31 22:00:39.969983104 +0200
+++ b/make.tmpl.in 2018-07-31 22:00:58.467613682 +0200
gnu: lvm2: Update to 2.03.07. * gnu/packages/linux.scm (lvm2): Update to 2.03.07. [source](snippet): Adjust confdir regex. [inputs]: Add LIBAIO. [arguments]: Add phase 'patch-configure. (lvm2-static)[arguments]: Don't build dmeventd. Add phase 'adjust-Makefile'.
2019-01-31 18:24:38 -05:00
@@ -63,7 +63,7 @@
gnu: lvm2: Fix static linking of dmeventd. Fixes a regression introduced in a3ed69b694eab393129348bbabbed8c59bad3772 where dmeventd.static fails to link against libm and breaks "lvm2-static". * gnu/packages/patches/lvm2-static-link.patch: Patch make.tmpl.in.
2018-07-31 16:18:51 -04:00
gnu: lvm2: Update to 2.03.07. * gnu/packages/linux.scm (lvm2): Update to 2.03.07. [source](snippet): Adjust confdir regex. [inputs]: Add LIBAIO. [arguments]: Add phase 'patch-configure. (lvm2-static)[arguments]: Don't build dmeventd. Add phase 'adjust-Makefile'.
2019-01-31 18:24:38 -05:00
LIBS += @LIBS@ $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(RT_LIBS) $(M_LIBS)
gnu: lvm2: Fix static linking of dmeventd. Fixes a regression introduced in a3ed69b694eab393129348bbabbed8c59bad3772 where dmeventd.static fails to link against libm and breaks "lvm2-static". * gnu/packages/patches/lvm2-static-link.patch: Patch make.tmpl.in.
2018-07-31 16:18:51 -04:00
# 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@
gnu: lvm2: Update to 2.03.07. * gnu/packages/linux.scm (lvm2): Update to 2.03.07. [source](snippet): Adjust confdir regex. [inputs]: Add LIBAIO. [arguments]: Add phase 'patch-configure. (lvm2-static)[arguments]: Don't build dmeventd. Add phase 'adjust-Makefile'.
2019-01-31 18:24:38 -05:00
--- 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@
Reference in a new issue Copy permalink