summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2020-09-27 09:55:14 +0100
committerSergei Trofimovich <slyfox@gentoo.org>2020-09-27 09:55:25 +0100
commita887bd2d76e02b7842fc72ecd69f8fbf32f98a36 (patch)
treebbc42d696bbc3e4250c1e309d741dc72fd4dfccc /app-emulation/ski
parentnet-proxy/shadowsocks-libev: version bump, 3.3.5 (diff)
downloadgentoo-a887bd2d76e02b7842fc72ecd69f8fbf32f98a36.tar.gz
gentoo-a887bd2d76e02b7842fc72ecd69f8fbf32f98a36.tar.bz2
gentoo-a887bd2d76e02b7842fc72ecd69f8fbf32f98a36.zip
app-emulation/ski: fix lexter/parser generation race
Reported-by: Agostino Sarubbo Closes: https://bugs.gentoo.org/744676 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'app-emulation/ski')
-rw-r--r--app-emulation/ski/files/ski-1.3.2-lex-deps.patch17
-rw-r--r--app-emulation/ski/ski-1.3.2-r4.ebuild1
2 files changed, 18 insertions, 0 deletions
diff --git a/app-emulation/ski/files/ski-1.3.2-lex-deps.patch b/app-emulation/ski/files/ski-1.3.2-lex-deps.patch
new file mode 100644
index 000000000000..1dc8470864e2
--- /dev/null
+++ b/app-emulation/ski/files/ski-1.3.2-lex-deps.patch
@@ -0,0 +1,17 @@
+escan.l depends on generated eparse.h.
+If eparse.h is not present yet escan.o
+could be built before ${YACC) is ran.
+
+https://bugs.gentoo.org/744676
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -113,7 +113,8 @@ BUILT_SOURCES= \
+ $(DAS_INSTR_DERIVED) \
+ $(ASM_HASH_DERIVED) \
+ $(ICNT_DERIVED) \
+- instr.c
++ instr.c \
++ eparse.h
+
+ ski_SOURCES= \
+ main.c
diff --git a/app-emulation/ski/ski-1.3.2-r4.ebuild b/app-emulation/ski/ski-1.3.2-r4.ebuild
index 3d904abf6d44..ed996625c01d 100644
--- a/app-emulation/ski/ski-1.3.2-r4.ebuild
+++ b/app-emulation/ski/ski-1.3.2-r4.ebuild
@@ -39,6 +39,7 @@ PATCHES=(
"${FILESDIR}"/${P}-prototypes.patch
"${FILESDIR}"/${P}-glibc-2.28.patch
"${FILESDIR}"/${P}-gcc-10.patch #707144
+ "${FILESDIR}"/${P}-lex-deps.patch #744676
)
src_prepare() {