| 1 |
commit: 16f1bcaa8abae55ad46bfa3c4bb49882834977a5 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 12 14:44:39 2021 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 12 14:45:22 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16f1bcaa |
| 7 |
|
| 8 |
sys-fs/lvm2: fix static link failure for dmsetup.static |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/762017 |
| 11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 12 |
|
| 13 |
.../lvm2-2.03.12-static-pkgconfig-libs-2.patch | 38 ++++++++++++++++++++++ |
| 14 |
sys-fs/lvm2/lvm2-2.03.12.ebuild | 1 + |
| 15 |
2 files changed, 39 insertions(+) |
| 16 |
|
| 17 |
diff --git a/sys-fs/lvm2/files/lvm2-2.03.12-static-pkgconfig-libs-2.patch b/sys-fs/lvm2/files/lvm2-2.03.12-static-pkgconfig-libs-2.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..a3a4642e828 |
| 20 |
--- /dev/null |
| 21 |
+++ b/sys-fs/lvm2/files/lvm2-2.03.12-static-pkgconfig-libs-2.patch |
| 22 |
@@ -0,0 +1,38 @@ |
| 23 |
+From 27ab05863dc56fcd7254bccf30797f9e3c448cac Mon Sep 17 00:00:00 2001 |
| 24 |
+From: Mike Gilbert <floppym@g.o> |
| 25 |
+Date: Mon, 12 Jul 2021 10:36:04 -0400 |
| 26 |
+Subject: [PATCH] libdm: add SELINUX_STATIC_LIBS and UDEV_STATIC_LIBS to |
| 27 |
+ make.tmpl.in |
| 28 |
+ |
| 29 |
+Fixes link failure for dmsetup.static. |
| 30 |
+--- |
| 31 |
+ libdm/make.tmpl.in | 4 +++- |
| 32 |
+ 1 file changed, 3 insertions(+), 1 deletion(-) |
| 33 |
+ |
| 34 |
+diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in |
| 35 |
+index a306101d5..2309fb3e5 100644 |
| 36 |
+--- a/libdm/make.tmpl.in |
| 37 |
++++ b/libdm/make.tmpl.in |
| 38 |
+@@ -55,7 +55,7 @@ RM = rm -f |
| 39 |
+ |
| 40 |
+ LIBS += @LIBS@ $(PTHREAD_LIBS) $(SELINUX_LIBS) $(UDEV_LIBS) $(RT_LIBS) $(M_LIBS) |
| 41 |
+ # Extra libraries always linked with static binaries |
| 42 |
+-STATIC_LIBS = $(PTHREAD_LIBS) |
| 43 |
++STATIC_LIBS = $(PTHREAD_LIBS) $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) |
| 44 |
+ DEFS += @DEFS@ |
| 45 |
+ # FIXME set this only where it's needed, not globally? |
| 46 |
+ CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@ |
| 47 |
+@@ -71,8 +71,10 @@ PTHREAD_LIBS = @PTHREAD_LIBS@ |
| 48 |
+ READLINE_LIBS = @READLINE_LIBS@ |
| 49 |
+ EDITLINE_LIBS = @EDITLINE_LIBS@ |
| 50 |
+ SELINUX_LIBS = @SELINUX_LIBS@ |
| 51 |
++SELINUX_STATIC_LIBS = @SELINUX_STATIC_LIBS@ |
| 52 |
+ UDEV_CFLAGS = @UDEV_CFLAGS@ |
| 53 |
+ UDEV_LIBS = @UDEV_LIBS@ |
| 54 |
++UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@ |
| 55 |
+ BLKID_CFLAGS = @BLKID_CFLAGS@ |
| 56 |
+ BLKID_LIBS = @BLKID_LIBS@ |
| 57 |
+ SYSTEMD_LIBS = @SYSTEMD_LIBS@ |
| 58 |
+-- |
| 59 |
+2.32.0 |
| 60 |
+ |
| 61 |
|
| 62 |
diff --git a/sys-fs/lvm2/lvm2-2.03.12.ebuild b/sys-fs/lvm2/lvm2-2.03.12.ebuild |
| 63 |
index a75dcf33246..93957db3a69 100644 |
| 64 |
--- a/sys-fs/lvm2/lvm2-2.03.12.ebuild |
| 65 |
+++ b/sys-fs/lvm2/lvm2-2.03.12.ebuild |
| 66 |
@@ -61,6 +61,7 @@ PATCHES=( |
| 67 |
#"${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed |
| 68 |
"${FILESDIR}"/${PN}-2.03.12-dynamic-static-ldflags.patch #332905 |
| 69 |
"${FILESDIR}"/${PN}-2.03.12-static-pkgconfig-libs.patch #370217, #439414 + blkid |
| 70 |
+ "${FILESDIR}"/${PN}-2.03.12-static-pkgconfig-libs-2.patch |
| 71 |
"${FILESDIR}"/${PN}-2.03.05-pthread-pkgconfig.patch #492450 |
| 72 |
"${FILESDIR}"/${PN}-2.03.12-static-libm.patch #617756 |
| 73 |
"${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446 |
Archives