diff options
author | Leo Famulari <leo@famulari.name> | 2016-11-23 00:11:30 -0500 |
---|---|---|
committer | Leo Famulari <leo@famulari.name> | 2016-11-23 00:11:30 -0500 |
commit | de76f0a45bad2654cc2561b463e3d6ec4d96c398 (patch) | |
tree | e1dcd0a33de2d8dffaa9d4c5068fc1fd0f149734 /gnu/packages/patches/lvm2-static-link.patch | |
parent | c70047f12d7e9d5138a1a217d0995882a8c5f459 (diff) | |
parent | 08b3e4a97066c9baaf39e3df7c2dd9c39e693ead (diff) | |
download | guix-de76f0a45bad2654cc2561b463e3d6ec4d96c398.tar guix-de76f0a45bad2654cc2561b463e3d6ec4d96c398.tar.gz |
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 | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/gnu/packages/patches/lvm2-static-link.patch b/gnu/packages/patches/lvm2-static-link.patch new file mode 100644 index 0000000000..b4b1dd92e1 --- /dev/null +++ b/gnu/packages/patches/lvm2-static-link.patch @@ -0,0 +1,14 @@ +Fix static linking of 'lvm.static', which indirectly depend on libpthread +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 +@@ -148,7 +148,7 @@ endif + + lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a $(interfacebuilddir)/libdevmapper.a + $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \ +- $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS) ++ $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS) $(PTHREAD_LIBS) + + liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o + cat $(top_builddir)/lib/liblvm-internal.a > $@ |