From: "Robin H. Johnson" <robbat2@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/files/, sys-fs/lvm2/
Date: Tue, 8 May 2018 17:11:42 +0000 (UTC) [thread overview]
Message-ID: <1525799465.da222eb668e9d0743688b0bd1608fd0824b1b8b1.robbat2@gentoo> (raw)
commit: da222eb668e9d0743688b0bd1608fd0824b1b8b1
Author: Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Sat May 5 00:35:07 2018 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue May 8 17:11:05 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da222eb6
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 <AT> gentoo.org>
sys-fs/lvm2/files/lvm2-2.02.171-static-libm.patch | 13 +++++++++++++
sys-fs/lvm2/lvm2-2.02.171.ebuild | 3 ++-
sys-fs/lvm2/lvm2-2.02.172.ebuild | 3 ++-
sys-fs/lvm2/lvm2-2.02.173.ebuild | 3 ++-
4 files changed, 19 insertions(+), 3 deletions(-)
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
index 00000000000..1cbf956db25
--- /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 63f12d1d8cd..fccd403cbc9 100644
--- 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 4c21fcf3446..0d9e8e6dc47 100644
--- 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 4c21fcf3446..0d9e8e6dc47 100644
--- 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
next reply other threads:[~2018-05-08 17:11 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-08 17:11 Robin H. Johnson [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-11-22 18:45 [gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/files/, sys-fs/lvm2/ Sam James
2024-11-17 16:15 Mike Gilbert
2023-12-27 22:22 Sam James
2023-05-10 17:47 David Seifert
2023-03-07 14:20 David Seifert
2023-01-29 11:55 David Seifert
2022-12-22 3:12 Sam James
2022-10-26 23:11 Robin H. Johnson
2021-12-27 0:05 Lars Wendler
2021-10-20 12:20 Lars Wendler
2021-07-12 14:45 Mike Gilbert
2020-04-27 0:50 Thomas Deutschmann
2020-04-27 0:50 Thomas Deutschmann
2020-04-22 15:45 Thomas Deutschmann
2020-04-14 18:34 Thomas Deutschmann
2019-11-27 16:03 Lars Wendler
2019-06-02 22:31 Thomas Deutschmann
2019-04-17 7:26 Robin H. Johnson
2019-04-08 19:11 Robin H. Johnson
2018-10-11 10:39 Lars Wendler
2018-08-04 22:13 Robin H. Johnson
2018-06-06 5:31 Jeroen Roovers
2017-07-09 22:05 Robin H. Johnson
2017-02-18 21:29 Marc Schiffbauer
2017-02-13 20:09 Marc Schiffbauer
2016-10-21 23:15 Robin H. Johnson
2016-03-15 3:59 Doug Goldstein
2016-03-10 15:37 Robin H. Johnson
2016-01-05 2:56 Doug Goldstein
2015-12-28 0:30 Robin H. Johnson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1525799465.da222eb668e9d0743688b0bd1608fd0824b1b8b1.robbat2@gentoo \
--to=robbat2@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox