diff options
| author | Marius Bakke <[email protected]> | 2018-08-01 15:53:17 +0200 |
|---|---|---|
| committer | Marius Bakke <[email protected]> | 2018-08-01 15:53:17 +0200 |
| commit | 4214066d45ec7030405577f225a9db0be04da1fd (patch) | |
| tree | 2a0d3b6fd454b04721775a2d6846138658cc61ab /gnu/packages/patches/lvm2-static-link.patch | |
| parent | 07ca7165f90079948e7174468b47ecc7cd38531d (diff) | |
| parent | ae66fdaf9f7971c0a1b33d0c20844e903ccd909c (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/lvm2-static-link.patch')
| -rw-r--r-- | gnu/packages/patches/lvm2-static-link.patch | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/gnu/packages/patches/lvm2-static-link.patch b/gnu/packages/patches/lvm2-static-link.patch index 6adf6891bb..eb7849a679 100644 --- a/gnu/packages/patches/lvm2-static-link.patch +++ b/gnu/packages/patches/lvm2-static-link.patch @@ -12,3 +12,14 @@ and libm via libdevmapper.a. liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o cat $(top_builddir)/lib/liblvm-internal.a > $@ +--- a/make.tmpl.in 2018-07-31 22:00:39.969983104 +0200 ++++ b/make.tmpl.in 2018-07-31 22:00:58.467613682 +0200 +@@ -53,7 +53,7 @@ + + LIBS = @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@ |