From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/, sys-fs/lvm2/files/
Date: Tue, 18 Jun 2019 09:03:40 +0000 (UTC) [thread overview]
Message-ID: <1560848600.708fc54cc41e78710557966a421eb734d07b3e64.polynomial-c@gentoo> (raw)
commit: 708fc54cc41e78710557966a421eb734d07b3e64
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 18 09:02:34 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jun 18 09:03:20 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=708fc54c
sys-fs/lvm2: Fixed build with app-shells/mksh
Thanks-to: Alexander Tsoy <alexander <AT> tsoy.me>
Closes: https://bugs.gentoo.org/686652
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-fs/lvm2/files/lvm2-2.02.184-mksh_build.patch | 13 +++++++++++++
sys-fs/lvm2/lvm2-2.02.185.ebuild | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/sys-fs/lvm2/files/lvm2-2.02.184-mksh_build.patch b/sys-fs/lvm2/files/lvm2-2.02.184-mksh_build.patch
new file mode 100644
index 00000000000..49c6853f23a
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.184-mksh_build.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/686652
+
+--- LVM2.2.02.184/tools/Makefile.in
++++ LVM2.2.02.184/tools/Makefile.in
+@@ -220,6 +220,6 @@
+ echo "/* Do not edit. This file is generated by the Makefile. */" && \
+ echo -en "const char _command_input[] =\n\n\"" && \
+ $(EGREP) -v '^#|\-\-\-|^$$' $(srcdir)/command-lines.in | $(AWK) 'BEGIN {ORS = "\\n\"\n\""} //' && \
+- echo "\\n\";" \
++ printf "%s\n" "\\n\";" \
+ ) > $@
+
+ $(SOURCES:%.c=%.d) $(SOURCES2:%.c=%.d): command-lines-input.h command-count.h cmds.h
diff --git a/sys-fs/lvm2/lvm2-2.02.185.ebuild b/sys-fs/lvm2/lvm2-2.02.185.ebuild
index 49ad4a19d86..871a483ce9f 100644
--- a/sys-fs/lvm2/lvm2-2.02.185.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.185.ebuild
@@ -49,7 +49,6 @@ BDEPEND="
virtual/pkgconfig
"
-
S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
PATCHES=(
@@ -70,6 +69,7 @@ PATCHES=(
#"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream
"${FILESDIR}"/${PN}-2.02.184-dmeventd-no-idle-exit.patch
#"${FILESDIR}"/${PN}-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch #682380 # merged upstream
+ "${FILESDIR}"/${PN}-2.02.184-mksh_build.patch #686652
)
pkg_setup() {
next reply other threads:[~2019-06-18 9:03 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-18 9:03 Lars Wendler [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-05-02 15:21 [gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/, sys-fs/lvm2/files/ Mike Gilbert
2023-06-02 13:02 David Seifert
2023-05-10 8:57 David Seifert
2023-05-10 8:57 David Seifert
2023-04-13 11:10 David Seifert
2023-02-21 20:29 David Seifert
2023-01-28 13:38 David Seifert
2023-01-13 11:11 David Seifert
2022-11-19 21:05 David Seifert
2022-11-18 17:59 Sam James
2022-10-27 17:13 Robin H. Johnson
2022-10-26 19:17 Mike Gilbert
2022-07-07 15:10 Mike Gilbert
2022-06-16 22:10 Sam James
2021-05-09 9:05 Lars Wendler
2020-03-26 20:24 Lars Wendler
2019-11-28 22:45 Robin H. Johnson
2019-11-27 16:16 Lars Wendler
2019-07-24 9:54 Lars Wendler
2019-06-18 5:27 Robin H. Johnson
2019-05-07 19:16 Robin H. Johnson
2019-04-17 7:26 Robin H. Johnson
2016-04-20 3:58 Mike Frysinger
2016-04-02 5:07 Mike Frysinger
2016-03-09 20:12 Robin H. Johnson
2016-01-25 2:40 Marc Schiffbauer
2015-12-28 0:30 Robin H. Johnson
2015-12-03 11:33 Lars Wendler
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=1560848600.708fc54cc41e78710557966a421eb734d07b3e64.polynomial-c@gentoo \
--to=polynomial-c@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