| 1 |
commit: da222eb668e9d0743688b0bd1608fd0824b1b8b1 |
| 2 |
Author: Conrad Kostecki <conrad <AT> kostecki <DOT> com> |
| 3 |
AuthorDate: Sat May 5 00:35:07 2018 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 8 17:11:05 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da222eb6 |
| 7 |
|
| 8 |
sys-fs/lvm2-2.02.17{1,2,3}: Fix static build |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/617756 |
| 11 |
Package-Manager: Portage-2.3.35, Repoman-2.3.9 |
| 12 |
(cherry picked from commit 0d57a354c5b3ab9db2b8e2ea6adbdad2dd6a1c03) |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/8265 |
| 14 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 15 |
|
| 16 |
sys-fs/lvm2/files/lvm2-2.02.171-static-libm.patch | 13 +++++++++++++ |
| 17 |
sys-fs/lvm2/lvm2-2.02.171.ebuild | 3 ++- |
| 18 |
sys-fs/lvm2/lvm2-2.02.172.ebuild | 3 ++- |
| 19 |
sys-fs/lvm2/lvm2-2.02.173.ebuild | 3 ++- |
| 20 |
4 files changed, 19 insertions(+), 3 deletions(-) |
| 21 |
|
| 22 |
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 |
| 23 |
new file mode 100644 |
| 24 |
index 00000000000..1cbf956db25 |
| 25 |
--- /dev/null |
| 26 |
+++ b/sys-fs/lvm2/files/lvm2-2.02.171-static-libm.patch |
| 27 |
@@ -0,0 +1,13 @@ |
| 28 |
+diff --git a/make.tmpl.in b/make.tmpl.in |
| 29 |
+index a40eaaa15..7eea943aa 100644 |
| 30 |
+--- a/make.tmpl.in |
| 31 |
++++ b/make.tmpl.in |
| 32 |
+@@ -53,7 +53,7 @@ PYCOMPILE = $(top_srcdir)/autoconf/py-compile |
| 33 |
+ |
| 34 |
+ LIBS = @LIBS@ |
| 35 |
+ # Extra libraries always linked with static binaries |
| 36 |
+-STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS) |
| 37 |
++STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS) $(M_LIBS) |
| 38 |
+ DEFS += @DEFS@ |
| 39 |
+ # FIXME set this only where it's needed, not globally? |
| 40 |
+ CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@ |
| 41 |
|
| 42 |
diff --git a/sys-fs/lvm2/lvm2-2.02.171.ebuild b/sys-fs/lvm2/lvm2-2.02.171.ebuild |
| 43 |
index 63f12d1d8cd..fccd403cbc9 100644 |
| 44 |
--- a/sys-fs/lvm2/lvm2-2.02.171.ebuild |
| 45 |
+++ b/sys-fs/lvm2/lvm2-2.02.171.ebuild |
| 46 |
@@ -1,4 +1,4 @@ |
| 47 |
-# Copyright 1999-2017 Gentoo Foundation |
| 48 |
+# Copyright 1999-2018 Gentoo Foundation |
| 49 |
# Distributed under the terms of the GNU General Public License v2 |
| 50 |
|
| 51 |
EAPI=6 |
| 52 |
@@ -66,6 +66,7 @@ PATCHES=( |
| 53 |
"${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373 |
| 54 |
"${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed |
| 55 |
"${FILESDIR}"/${PN}-2.02.139-dynamic-static-ldflags.patch #332905 |
| 56 |
+ "${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756 |
| 57 |
"${FILESDIR}"/${PN}-2.02.129-static-pkgconfig-libs.patch #370217, #439414 + blkid |
| 58 |
"${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450 |
| 59 |
#"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream |
| 60 |
|
| 61 |
diff --git a/sys-fs/lvm2/lvm2-2.02.172.ebuild b/sys-fs/lvm2/lvm2-2.02.172.ebuild |
| 62 |
index 4c21fcf3446..0d9e8e6dc47 100644 |
| 63 |
--- a/sys-fs/lvm2/lvm2-2.02.172.ebuild |
| 64 |
+++ b/sys-fs/lvm2/lvm2-2.02.172.ebuild |
| 65 |
@@ -1,4 +1,4 @@ |
| 66 |
-# Copyright 1999-2017 Gentoo Foundation |
| 67 |
+# Copyright 1999-2018 Gentoo Foundation |
| 68 |
# Distributed under the terms of the GNU General Public License v2 |
| 69 |
|
| 70 |
EAPI=6 |
| 71 |
@@ -66,6 +66,7 @@ PATCHES=( |
| 72 |
"${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373 |
| 73 |
"${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed |
| 74 |
"${FILESDIR}"/${PN}-2.02.139-dynamic-static-ldflags.patch #332905 |
| 75 |
+ "${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756 |
| 76 |
"${FILESDIR}"/${PN}-2.02.172-static-pkgconfig-libs.patch #370217, #439414 + blkid |
| 77 |
"${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450 |
| 78 |
#"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream |
| 79 |
|
| 80 |
diff --git a/sys-fs/lvm2/lvm2-2.02.173.ebuild b/sys-fs/lvm2/lvm2-2.02.173.ebuild |
| 81 |
index 4c21fcf3446..0d9e8e6dc47 100644 |
| 82 |
--- a/sys-fs/lvm2/lvm2-2.02.173.ebuild |
| 83 |
+++ b/sys-fs/lvm2/lvm2-2.02.173.ebuild |
| 84 |
@@ -1,4 +1,4 @@ |
| 85 |
-# Copyright 1999-2017 Gentoo Foundation |
| 86 |
+# Copyright 1999-2018 Gentoo Foundation |
| 87 |
# Distributed under the terms of the GNU General Public License v2 |
| 88 |
|
| 89 |
EAPI=6 |
| 90 |
@@ -66,6 +66,7 @@ PATCHES=( |
| 91 |
"${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373 |
| 92 |
"${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed |
| 93 |
"${FILESDIR}"/${PN}-2.02.139-dynamic-static-ldflags.patch #332905 |
| 94 |
+ "${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756 |
| 95 |
"${FILESDIR}"/${PN}-2.02.172-static-pkgconfig-libs.patch #370217, #439414 + blkid |
| 96 |
"${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450 |
| 97 |
#"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream |
Archives