summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-08-01 10:25:21 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-03 11:14:13 +0100
commit7dd7ef3bd231cb8ba5459b3a7717b145c115af6d (patch)
treea9535180a6e145bb4a55a1e275e616bb83f13cb0
parent64d15c298dd46e9ba200d77de6d0ab96ec24588c (diff)
downloadpoky-7dd7ef3bd231cb8ba5459b3a7717b145c115af6d.tar.gz
re2c: fix build race
(From OE-Core rev: 33bd61e34f0d17841f0817bfdcdf87320a6743ec) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/re2c/re2c/mkdir.patch36
-rw-r--r--meta/recipes-support/re2c/re2c_0.16.bb2
2 files changed, 37 insertions, 1 deletions
diff --git a/meta/recipes-support/re2c/re2c/mkdir.patch b/meta/recipes-support/re2c/re2c/mkdir.patch
new file mode 100644
index 0000000000..d59f01b36c
--- /dev/null
+++ b/meta/recipes-support/re2c/re2c/mkdir.patch
@@ -0,0 +1,36 @@
1Upstream-Status: Submitted (https://github.com/skvadrik/re2c/pull/191)
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From bccc10c60523f88c8f81413151cdcd612eb16198 Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Mon, 31 Jul 2017 15:43:41 +0100
7Subject: [PATCH] Makefile.am: create target directory before writing into it
8
9In some situations src/parse/ may not exist before a file is copied into the
10directory. Ensure that this doesn't happen by creating the directory first.
11---
12 re2c/Makefile.am | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/re2c/Makefile.am b/re2c/Makefile.am
16index 3b3b2c5e..0707fc5a 100644
17--- a/Makefile.am
18+++ b/Makefile.am
19@@ -187,6 +187,7 @@ CLEANFILES = \
20 $(DOC)
21
22 $(AUTOGEN_PARSER): $(CUSTOM_PARSER)
23+ $(AM_V_at)$(MKDIR_P) $(dir $@)
24 $(AM_V_GEN) if test $(BISON) = "no"; \
25 then \
26 cp $(top_srcdir)/$(BOOTSTRAP_PARSER) $@ && \
27@@ -211,6 +212,7 @@ $(BOOTSTRAP_PARSER): $(CUSTOM_PARSER)
28 $(top_srcdir)/$(CUSTOM_PARSER);
29
30 .re.cc:
31+ $(AM_V_at)$(MKDIR_P) $(dir $@)
32 $(AM_V_GEN) if test -x $(RE2C); \
33 then \
34 $(top_builddir)/$(RE2C) $(RE2CFLAGS) -o $@ $< && \
35--
362.11.0
diff --git a/meta/recipes-support/re2c/re2c_0.16.bb b/meta/recipes-support/re2c/re2c_0.16.bb
index e82502c5f2..50dd7b7d26 100644
--- a/meta/recipes-support/re2c/re2c_0.16.bb
+++ b/meta/recipes-support/re2c/re2c_0.16.bb
@@ -6,7 +6,7 @@ LICENSE = "PD"
6LIC_FILES_CHKSUM = "file://README;beginline=146;md5=881056c9add17f8019ccd8c382ba963a" 6LIC_FILES_CHKSUM = "file://README;beginline=146;md5=881056c9add17f8019ccd8c382ba963a"
7 7
8SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ 8SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
9" 9 file://mkdir.patch"
10SRC_URI[md5sum] = "3bf508fabd52ed7334647d0ccb956e8d" 10SRC_URI[md5sum] = "3bf508fabd52ed7334647d0ccb956e8d"
11SRC_URI[sha256sum] = "48c12564297641cceb5ff05aead57f28118db6277f31e2262437feba89069e84" 11SRC_URI[sha256sum] = "48c12564297641cceb5ff05aead57f28118db6277f31e2262437feba89069e84"
12 12