sys-fs/lvm2-2.02.17{1,2,3}: Fix static build

Closes: https://bugs.gentoo.org/617756
Package-Manager: Portage-2.3.35, Repoman-2.3.9
(cherry picked from commit 0d57a354c5b3ab9db2b8e2ea6adbdad2dd6a1c03)
Closes: https://github.com/gentoo/gentoo/pull/8265
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

diff --git a/sys-fs/lvm2/files/lvm2-2.02.171-static-libm.patch b/sys-fs/lvm2/files/lvm2-2.02.171-static-libm.patch
new file mode 100644 (file)
index 0000000..1cbf956
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.171-static-libm.patch
@@ -0,0 +1,13 @@
+diff --git a/make.tmpl.in b/make.tmpl.in
+index a40eaaa15..7eea943aa 100644
+--- a/make.tmpl.in
++++ b/make.tmpl.in
+@@ -53,7 +53,7 @@ PYCOMPILE = $(top_srcdir)/autoconf/py-compile
+ 
+ LIBS = @LIBS@
+ # Extra libraries always linked with static binaries
+-STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS)
++STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS) $(M_LIBS)
+ DEFS += @DEFS@
+ # FIXME set this only where it's needed, not globally?
+ CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@

diff --git a/sys-fs/lvm2/lvm2-2.02.171.ebuild b/sys-fs/lvm2/lvm2-2.02.171.ebuild
index 63f12d1d8cdea5e876e58a4cb06a658027e36348..fccd403cbc94255b90cc48bf20be6d6a43ef1b89 100644 (file)
--- a/sys-fs/lvm2/lvm2-2.02.171.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.171.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -66,6 +66,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
        "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
        "${FILESDIR}"/${PN}-2.02.139-dynamic-static-ldflags.patch #332905
+       "${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756
        "${FILESDIR}"/${PN}-2.02.129-static-pkgconfig-libs.patch #370217, #439414 + blkid
        "${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450
        #"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream

diff --git a/sys-fs/lvm2/lvm2-2.02.172.ebuild b/sys-fs/lvm2/lvm2-2.02.172.ebuild
index 4c21fcf3446e8b6f596e1715d30db7c7461470ba..0d9e8e6dc479293bfced2d01c53e5b7175165016 100644 (file)
--- a/sys-fs/lvm2/lvm2-2.02.172.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.172.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -66,6 +66,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
        "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
        "${FILESDIR}"/${PN}-2.02.139-dynamic-static-ldflags.patch #332905
+       "${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756
        "${FILESDIR}"/${PN}-2.02.172-static-pkgconfig-libs.patch #370217, #439414 + blkid
        "${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450
        #"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream

diff --git a/sys-fs/lvm2/lvm2-2.02.173.ebuild b/sys-fs/lvm2/lvm2-2.02.173.ebuild
index 4c21fcf3446e8b6f596e1715d30db7c7461470ba..0d9e8e6dc479293bfced2d01c53e5b7175165016 100644 (file)
--- a/sys-fs/lvm2/lvm2-2.02.173.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.173.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -66,6 +66,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
        "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
        "${FILESDIR}"/${PN}-2.02.139-dynamic-static-ldflags.patch #332905
+       "${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756
        "${FILESDIR}"/${PN}-2.02.172-static-pkgconfig-libs.patch #370217, #439414 + blkid
        "${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450
        #"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream