summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChong Lu <Chong.Lu@windriver.com>2014-06-04 13:35:41 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-10 17:24:19 +0100
commit0ba1d79e76defcfe7199641b8716e2d2c9e31f8d (patch)
treed9d6e17284c3d75b5c1da3eea84434bdf5ccedee /meta
parente922be50b3aaa9366019de927558c9785d7ab0c0 (diff)
downloadpoky-0ba1d79e76defcfe7199641b8716e2d2c9e31f8d.tar.gz
nfs-utils: unset CFLAGS for testlk build
testlk is built with host gcc at do_compile stage, which leads to unrecognized some flags for special architecture. So unset CFLAGS for testlk to make sure it passed. (From OE-Core rev: 2461336b9432cf8379bda19d425ba00e542fbab7) Signed-off-by: Chong Lu <Chong.Lu@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-unset-CFLAGS-for-testlk-build.patch31
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb4
2 files changed, 34 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-unset-CFLAGS-for-testlk-build.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-unset-CFLAGS-for-testlk-build.patch
new file mode 100644
index 0000000000..6f06edfaa9
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-unset-CFLAGS-for-testlk-build.patch
@@ -0,0 +1,31 @@
1From c6819380f27eeb57210b3d2758aa2f8e6af54b56 Mon Sep 17 00:00:00 2001
2From: Chong Lu <Chong.Lu@windriver.com>
3Date: Tue, 3 Jun 2014 09:56:50 +0800
4Subject: [PATCH] nfs-utils: unset CFLAGS for testlk build
5
6testlk is built with host gcc at do_compile stage, which leads to unrecognized
7some flags for special architecture. So unset CFLAGS for testlk to make sure
8it passed.
9
10Upstream-Status: Pending
11
12Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
13---
14 tools/locktest/Makefile.am | 1 +
15 1 file changed, 1 insertion(+)
16
17diff --git a/tools/locktest/Makefile.am b/tools/locktest/Makefile.am
18index 3156815..325b061 100644
19--- a/tools/locktest/Makefile.am
20+++ b/tools/locktest/Makefile.am
21@@ -1,6 +1,7 @@
22 ## Process this file with automake to produce Makefile.in
23
24 CC=$(CC_FOR_BUILD)
25+CFLAGS =
26 LIBTOOL = @LIBTOOL@ --tag=CC
27
28 noinst_PROGRAMS = testlk
29--
301.7.9.5
31
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb
index 048b0e566d..689fe5512d 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb
@@ -28,7 +28,9 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
28 file://nfs-utils.conf \ 28 file://nfs-utils.conf \
29 file://nfs-server.service \ 29 file://nfs-server.service \
30 file://nfs-mountd.service \ 30 file://nfs-mountd.service \
31 file://nfs-statd.service " 31 file://nfs-statd.service \
32 file://nfs-utils-unset-CFLAGS-for-testlk-build.patch \
33"
32 34
33SRC_URI[md5sum] = "6e93a7997ca3a1eac56bf219adab72a8" 35SRC_URI[md5sum] = "6e93a7997ca3a1eac56bf219adab72a8"
34SRC_URI[sha256sum] = "ab8384d0e487ed6a18c5380d5df28015f7dd98680bf08f3247c97d9f7d99e56f" 36SRC_URI[sha256sum] = "ab8384d0e487ed6a18c5380d5df28015f7dd98680bf08f3247c97d9f7d99e56f"