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() {
