commit:     2f902cc64fdb168359095ac981f24f484812b611
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Fri Jul 17 07:30:04 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Jul 17 21:56:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f902cc6

dev-util/ply: fix build failure on arm

Bug: https://bugs.gentoo.org/732502
Closes: https://bugs.gentoo.org/732902
Closes: https://github.com/gentoo/gentoo/pull/16724
Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 dev-util/ply/files/ply-2.1.1-arm-build-fix.patch | 37 ++++++++++++++++++++++++
 dev-util/ply/ply-2.1.1.ebuild                    |  1 +
 2 files changed, 38 insertions(+)

diff --git a/dev-util/ply/files/ply-2.1.1-arm-build-fix.patch 
b/dev-util/ply/files/ply-2.1.1-arm-build-fix.patch
new file mode 100644
index 00000000000..0d12f7724e7
--- /dev/null
+++ b/dev-util/ply/files/ply-2.1.1-arm-build-fix.patch
@@ -0,0 +1,37 @@
+From 6f870ba1f4054674024cc3d3faf18d8b1e3676f6 Mon Sep 17 00:00:00 2001
+From: Jakov Smolic <[email protected]>
+Date: Fri, 17 Jul 2020 09:10:45 +0200
+Subject: [PATCH] Fix armv7a build crash
+Bug: https://bugs.gentoo.org/732902
+Upstream: https://github.com/iovisor/ply/pull/60
+
+Signed-off-by: Jakov Smolic <[email protected]>
+---
+ src/libply/Makefile.am   | 1 +
+ src/libply/arch/armv7a.c | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 120000 src/libply/arch/armv7a.c
+
+diff --git a/src/libply/Makefile.am b/src/libply/Makefile.am
+index 3c83bb4..3a7c747 100644
+--- a/src/libply/Makefile.am
++++ b/src/libply/Makefile.am
+@@ -10,6 +10,7 @@ AM_LFLAGS = --header-file=lexer.h
+ EXTRA_DIST = grammar.c grammar.h lexer.c lexer.h \
+       arch/aarch64.c \
+       arch/arm.c     \
++      arch/armv7a.c \
+       arch/powerpc.c \
+       arch/x86_64.c
+ 
+diff --git a/src/libply/arch/armv7a.c b/src/libply/arch/armv7a.c
+new file mode 120000
+index 0000000..980a6a5
+--- /dev/null
++++ b/src/libply/arch/armv7a.c
+@@ -0,0 +1 @@
++arm.c
+\ No newline at end of file
+-- 
+2.26.2
+

diff --git a/dev-util/ply/ply-2.1.1.ebuild b/dev-util/ply/ply-2.1.1.ebuild
index b55b489d5d4..fa013b2f639 100644
--- a/dev-util/ply/ply-2.1.1.ebuild
+++ b/dev-util/ply/ply-2.1.1.ebuild
@@ -23,6 +23,7 @@ pkg_pretend() {
 
 src_prepare() {
        sed -i "/^AC_INIT/c\AC_INIT(${PN}, ${PV}," configure.ac || die
+       eapply "${FILESDIR}/${P}-arm-build-fix.patch"
        eapply_user
        eautoreconf
 }

Reply via email to