summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy.Li <rongqing.li@windriver.com>2013-07-02 09:35:11 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-02 22:26:58 +0100
commitdae98efbd8f4de4aa56e96b70f38b7158e2d9021 (patch)
tree75fc3e4475edd36efb9a7e49f6168d1a5f92c28f
parent61bfb25241cc5f906e517ffd80223969054b8934 (diff)
downloadpoky-dae98efbd8f4de4aa56e96b70f38b7158e2d9021.tar.gz
sysstat: backport a patch to fix a parallel building error
(From OE-Core rev: 3e1dbabbf33a2e461abc92ff10cd970fe604ee38) Signed-off-by: Roy.Li <rongqing.li@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/sysstat/files/0001-Update-Makefile-to-allow-for-parallel-execution.patch34
-rw-r--r--meta/recipes-extended/sysstat/sysstat.inc3
2 files changed, 36 insertions, 1 deletions
diff --git a/meta/recipes-extended/sysstat/files/0001-Update-Makefile-to-allow-for-parallel-execution.patch b/meta/recipes-extended/sysstat/files/0001-Update-Makefile-to-allow-for-parallel-execution.patch
new file mode 100644
index 0000000000..c82b19cf10
--- /dev/null
+++ b/meta/recipes-extended/sysstat/files/0001-Update-Makefile-to-allow-for-parallel-execution.patch
@@ -0,0 +1,34 @@
1Upstream-Status: Backport
2Signed-off-by: Roy.Li <rongqing.li@windriver.com>
3
4From eb44730094a68f4d37d95ddc3480a5972619b43f Mon Sep 17 00:00:00 2001
5From: Sebastien GODARD <sysstat@orange.fr.fake>
6Date: Sat, 22 Jun 2013 14:08:40 +0200
7Subject: [PATCH] Update Makefile to allow for parallel execution
8
9Rewrite rule for librdstats.a in Makefile to prevent possible file
10corruption when using make -j.
11
12Signed-off-by: Sebastien GODARD <sysstat@orange.fr.fake>
13---
14 Makefile.in | 4 +++-
15 1 file changed, 3 insertions(+), 1 deletion(-)
16
17diff --git a/Makefile.in b/Makefile.in
18index f8e6159..159cacf 100644
19--- a/Makefile.in
20+++ b/Makefile.in
21@@ -202,7 +202,9 @@ sadf_misc.o: sadf_misc.c sadf.h sa.h
22 libsyscom.a: common.o ioconf.o
23 $(AR) rvs $@ $?
24
25-librdstats.a: librdstats.a(rd_stats.o count.o)
26+# Ditto
27+librdstats.a: rd_stats.o count.o
28+ $(AR) rvs $@ $?
29
30 librdsensors.a: librdsensors.a(rd_sensors.o)
31
32--
331.7.10.4
34
diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc
index 263cbd247c..ac3c89be3c 100644
--- a/meta/recipes-extended/sysstat/sysstat.inc
+++ b/meta/recipes-extended/sysstat/sysstat.inc
@@ -5,7 +5,8 @@ LICENSE = "GPLv2+"
5SECTION = "console/utils" 5SECTION = "console/utils"
6 6
7SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.gz \ 7SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.gz \
8 file://99_sysstat" 8 file://99_sysstat \
9 file://0001-Update-Makefile-to-allow-for-parallel-execution.patch "
9 10
10inherit autotools gettext 11inherit autotools gettext
11 12