sys-fs/lvm2: Fixed build with app-shells/mksh

Thanks-to: Alexander Tsoy <alexander@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@gentoo.org>

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 (file)
index 0000000..49c6853
--- /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 49ad4a19d86d0fefb64baa291ccebd69e097feb6..871a483ce9f3fd2726950d3b9f43ca2da2a566fd 100644 (file)
--- 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() {