summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2019-06-18 11:02:34 +0200
committerLars Wendler <polynomial-c@gentoo.org>2019-06-18 11:03:20 +0200
commit708fc54cc41e78710557966a421eb734d07b3e64 (patch)
tree4eed1cde9bf81d7f6620b68cf2bf83d6f8c47fbd
parentsys-fs/lvm2: Bumped ebuild to EAPI-7 (diff)
downloadgentoo-708fc54cc41e78710557966a421eb734d07b3e64.tar.gz
gentoo-708fc54cc41e78710557966a421eb734d07b3e64.tar.bz2
gentoo-708fc54cc41e78710557966a421eb734d07b3e64.zip
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>
-rw-r--r--sys-fs/lvm2/files/lvm2-2.02.184-mksh_build.patch13
-rw-r--r--sys-fs/lvm2/lvm2-2.02.185.ebuild2
2 files changed, 14 insertions, 1 deletions
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() {