From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 73815138334 for ; Tue, 18 Jun 2019 09:03:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 969C7E0891; Tue, 18 Jun 2019 09:03:44 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7AE2BE0891 for ; Tue, 18 Jun 2019 09:03:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D42693463E2 for ; Tue, 18 Jun 2019 09:03:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B9B5E4D3 for ; Tue, 18 Jun 2019 09:03:40 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1560848600.708fc54cc41e78710557966a421eb734d07b3e64.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/, sys-fs/lvm2/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/lvm2/files/lvm2-2.02.184-mksh_build.patch sys-fs/lvm2/lvm2-2.02.185.ebuild X-VCS-Directories: sys-fs/lvm2/ sys-fs/lvm2/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 708fc54cc41e78710557966a421eb734d07b3e64 X-VCS-Branch: master Date: Tue, 18 Jun 2019 09:03:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 31ed34e4-6c20-4c6a-b654-529c87fe1c1a X-Archives-Hash: a0bd1fef0ec8cbaa8cc60ffff0692e65 commit: 708fc54cc41e78710557966a421eb734d07b3e64 Author: Lars Wendler gentoo org> AuthorDate: Tue Jun 18 09:02:34 2019 +0000 Commit: Lars Wendler gentoo 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 tsoy.me> Closes: https://bugs.gentoo.org/686652 Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Lars Wendler 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() {