diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2021-07-12 10:44:39 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2021-07-12 10:45:22 -0400 |
| commit | 16f1bcaa8abae55ad46bfa3c4bb49882834977a5 (patch) | |
| tree | f726adb56025ddf4913c498c60ed6674f8d49efd /sys-fs/lvm2 | |
| parent | media-gfx/imagemagick: drop old (diff) | |
| download | gentoo-16f1bcaa8abae55ad46bfa3c4bb49882834977a5.tar.gz gentoo-16f1bcaa8abae55ad46bfa3c4bb49882834977a5.tar.bz2 gentoo-16f1bcaa8abae55ad46bfa3c4bb49882834977a5.zip | |
sys-fs/lvm2: fix static link failure for dmsetup.static
Bug: https://bugs.gentoo.org/762017
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'sys-fs/lvm2')
| -rw-r--r-- | sys-fs/lvm2/files/lvm2-2.03.12-static-pkgconfig-libs-2.patch | 38 | ||||
| -rw-r--r-- | sys-fs/lvm2/lvm2-2.03.12.ebuild | 1 |
2 files changed, 39 insertions, 0 deletions
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 new file mode 100644 index 000000000000..a3a4642e8281 --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-2.03.12-static-pkgconfig-libs-2.patch @@ -0,0 +1,38 @@ +From 27ab05863dc56fcd7254bccf30797f9e3c448cac Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Mon, 12 Jul 2021 10:36:04 -0400 +Subject: [PATCH] libdm: add SELINUX_STATIC_LIBS and UDEV_STATIC_LIBS to + make.tmpl.in + +Fixes link failure for dmsetup.static. +--- + libdm/make.tmpl.in | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in +index a306101d5..2309fb3e5 100644 +--- a/libdm/make.tmpl.in ++++ b/libdm/make.tmpl.in +@@ -55,7 +55,7 @@ RM = rm -f + + LIBS += @LIBS@ $(PTHREAD_LIBS) $(SELINUX_LIBS) $(UDEV_LIBS) $(RT_LIBS) $(M_LIBS) + # Extra libraries always linked with static binaries +-STATIC_LIBS = $(PTHREAD_LIBS) ++STATIC_LIBS = $(PTHREAD_LIBS) $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) + DEFS += @DEFS@ + # FIXME set this only where it's needed, not globally? + CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@ +@@ -71,8 +71,10 @@ PTHREAD_LIBS = @PTHREAD_LIBS@ + READLINE_LIBS = @READLINE_LIBS@ + EDITLINE_LIBS = @EDITLINE_LIBS@ + SELINUX_LIBS = @SELINUX_LIBS@ ++SELINUX_STATIC_LIBS = @SELINUX_STATIC_LIBS@ + UDEV_CFLAGS = @UDEV_CFLAGS@ + UDEV_LIBS = @UDEV_LIBS@ ++UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@ + BLKID_CFLAGS = @BLKID_CFLAGS@ + BLKID_LIBS = @BLKID_LIBS@ + SYSTEMD_LIBS = @SYSTEMD_LIBS@ +-- +2.32.0 + diff --git a/sys-fs/lvm2/lvm2-2.03.12.ebuild b/sys-fs/lvm2/lvm2-2.03.12.ebuild index a75dcf332464..93957db3a69f 100644 --- a/sys-fs/lvm2/lvm2-2.03.12.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.12.ebuild @@ -61,6 +61,7 @@ PATCHES=( #"${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed "${FILESDIR}"/${PN}-2.03.12-dynamic-static-ldflags.patch #332905 "${FILESDIR}"/${PN}-2.03.12-static-pkgconfig-libs.patch #370217, #439414 + blkid + "${FILESDIR}"/${PN}-2.03.12-static-pkgconfig-libs-2.patch "${FILESDIR}"/${PN}-2.03.05-pthread-pkgconfig.patch #492450 "${FILESDIR}"/${PN}-2.03.12-static-libm.patch #617756 "${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446 |