summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch42
-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.bb2
3 files changed, 43 insertions, 32 deletions
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch
new file mode 100644
index 0000000000..993f1e5ea5
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch
@@ -0,0 +1,42 @@
1nfs-utils: Do not pass CFLAGS to gcc while building
2
3Do not pass CFLAGS/LDFLAGS to gcc while building, The needed flags has
4been passed by xxx_CFLAGS=$(CFLAGS_FOR_BUILD).
5
6Upstream-Status: Pending
7
8Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
9---
10 tools/locktest/Makefile.am | 2 ++
11 tools/rpcgen/Makefile.am | 2 ++
12 2 files changed, 4 insertions(+)
13
14diff --git a/tools/locktest/Makefile.am b/tools/locktest/Makefile.am
15index 3156815..1729fd1 100644
16--- a/tools/locktest/Makefile.am
17+++ b/tools/locktest/Makefile.am
18@@ -1,6 +1,8 @@
19 ## Process this file with automake to produce Makefile.in
20
21 CC=$(CC_FOR_BUILD)
22+CFLAGS=
23+LDFLAGS=
24 LIBTOOL = @LIBTOOL@ --tag=CC
25
26 noinst_PROGRAMS = testlk
27diff --git a/tools/rpcgen/Makefile.am b/tools/rpcgen/Makefile.am
28index 8a9ec89..8bacdaa 100644
29--- a/tools/rpcgen/Makefile.am
30+++ b/tools/rpcgen/Makefile.am
31@@ -1,6 +1,8 @@
32 ## Process this file with automake to produce Makefile.in
33
34 CC=$(CC_FOR_BUILD)
35+CFLAGS=
36+LDFLAGS=
37 LIBTOOL = @LIBTOOL@ --tag=CC
38
39 noinst_PROGRAMS = rpcgen
40--
411.7.9.5
42
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
deleted file mode 100644
index 6f06edfaa9..0000000000
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-unset-CFLAGS-for-testlk-build.patch
+++ /dev/null
@@ -1,31 +0,0 @@
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 689fe5512d..8575647473 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
@@ -29,7 +29,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
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 \ 32 file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \
33" 33"
34 34
35SRC_URI[md5sum] = "6e93a7997ca3a1eac56bf219adab72a8" 35SRC_URI[md5sum] = "6e93a7997ca3a1eac56bf219adab72a8"