aboutsummaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChong Lu <Chong.Lu@windriver.com>2014-06-04 13:35:41 +0800
committerAndreas Oberritter <obi@opendreambox.org>2015-02-23 17:15:39 +0100
commit190add2dbd6557dcb570eeb7adb4c626c0ef8356 (patch)
treeb9d382c77d1af697380b9cbcf07d45fd8ea6e0c1 /meta
parent54963e7d2af23ace7e0d4cf93b735bdaf4eda4ff (diff)
downloadopenembedded-core-contrib-190add2dbd6557dcb570eeb7adb4c626c0ef8356.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. Signed-off-by: Chong Lu <Chong.Lu@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> (cherry picked from commit 2461336b9432cf8379bda19d425ba00e542fbab7) Signed-off-by: Andreas Oberritter <obi@opendreambox.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 @@
+From c6819380f27eeb57210b3d2758aa2f8e6af54b56 Mon Sep 17 00:00:00 2001
+From: Chong Lu <Chong.Lu@windriver.com>
+Date: Tue, 3 Jun 2014 09:56:50 +0800
+Subject: [PATCH] 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.
+
+Upstream-Status: Pending
+
+Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
+---
+ tools/locktest/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tools/locktest/Makefile.am b/tools/locktest/Makefile.am
+index 3156815..325b061 100644
+--- a/tools/locktest/Makefile.am
++++ b/tools/locktest/Makefile.am
+@@ -1,6 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+
+ CC=$(CC_FOR_BUILD)
++CFLAGS =
+ LIBTOOL = @LIBTOOL@ --tag=CC
+
+ noinst_PROGRAMS = testlk
+--
+1.7.9.5
+
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 0075a5dcb2..ca88821ae6 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
file://nfs-utils.conf \
file://nfs-server.service \
file://nfs-mountd.service \
- file://nfs-statd.service "
+ file://nfs-statd.service \
+ file://nfs-utils-unset-CFLAGS-for-testlk-build.patch \
+"
SRC_URI[md5sum] = "6e93a7997ca3a1eac56bf219adab72a8"
SRC_URI[sha256sum] = "ab8384d0e487ed6a18c5380d5df28015f7dd98680bf08f3247c97d9f7d99e56f"