nfs-utils: Do not pass CFLAGS to gcc while building

Do not pass CFLAGS/LDFLAGS to gcc while building, The needed flags has
been passed by xxx_CFLAGS=$(CFLAGS_FOR_BUILD).

(From OE-Core rev: e4b01d651cf94185cfb285a7b64292b26b74c6bb)

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>
This commit is contained in:
Chong Lu 2014-06-12 10:23:40 +08:00 committed by Richard Purdie
parent 6f0eb996ec
commit 82fc96d309
3 changed files with 43 additions and 32 deletions

View File

@ -0,0 +1,42 @@
nfs-utils: Do not pass CFLAGS to gcc while building
Do not pass CFLAGS/LDFLAGS to gcc while building, The needed flags has
been passed by xxx_CFLAGS=$(CFLAGS_FOR_BUILD).
Upstream-Status: Pending
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
tools/locktest/Makefile.am | 2 ++
tools/rpcgen/Makefile.am | 2 ++
2 files changed, 4 insertions(+)
diff --git a/tools/locktest/Makefile.am b/tools/locktest/Makefile.am
index 3156815..1729fd1 100644
--- a/tools/locktest/Makefile.am
+++ b/tools/locktest/Makefile.am
@@ -1,6 +1,8 @@
## Process this file with automake to produce Makefile.in
CC=$(CC_FOR_BUILD)
+CFLAGS=
+LDFLAGS=
LIBTOOL = @LIBTOOL@ --tag=CC
noinst_PROGRAMS = testlk
diff --git a/tools/rpcgen/Makefile.am b/tools/rpcgen/Makefile.am
index 8a9ec89..8bacdaa 100644
--- a/tools/rpcgen/Makefile.am
+++ b/tools/rpcgen/Makefile.am
@@ -1,6 +1,8 @@
## Process this file with automake to produce Makefile.in
CC=$(CC_FOR_BUILD)
+CFLAGS=
+LDFLAGS=
LIBTOOL = @LIBTOOL@ --tag=CC
noinst_PROGRAMS = rpcgen
--
1.7.9.5

View File

@ -1,31 +0,0 @@
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

View File

@ -29,7 +29,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
file://nfs-server.service \
file://nfs-mountd.service \
file://nfs-statd.service \
file://nfs-utils-unset-CFLAGS-for-testlk-build.patch \
file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \
"
SRC_URI[md5sum] = "6e93a7997ca3a1eac56bf219adab72a8"