summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Don-t-build-tools-with-CC_FOR_BUILD.patch40
-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_2.3.3.bb7
3 files changed, 41 insertions, 48 deletions
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Don-t-build-tools-with-CC_FOR_BUILD.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Don-t-build-tools-with-CC_FOR_BUILD.patch
new file mode 100644
index 0000000000..23bc3eaf72
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Don-t-build-tools-with-CC_FOR_BUILD.patch
@@ -0,0 +1,40 @@
1From 79019d976584c598f8d0a9d8de43c989946f974b Mon Sep 17 00:00:00 2001
2From: Pascal Bach <pascal.bach@siemens.com>
3Date: Wed, 13 Feb 2019 09:28:07 +0100
4Subject: [PATCH] Don't build tools with CC_FOR_BUILD
5
6The tools are intended for the target not for the host.
7
8Upstream-Status: Pending
9
10Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
11---
12 tools/locktest/Makefile.am | 1 -
13 tools/rpcgen/Makefile.am | 1 -
14 2 files changed, 2 deletions(-)
15
16diff --git a/tools/locktest/Makefile.am b/tools/locktest/Makefile.am
17index 3156815..87d0bac 100644
18--- a/tools/locktest/Makefile.am
19+++ b/tools/locktest/Makefile.am
20@@ -1,6 +1,5 @@
21 ## Process this file with automake to produce Makefile.in
22
23-CC=$(CC_FOR_BUILD)
24 LIBTOOL = @LIBTOOL@ --tag=CC
25
26 noinst_PROGRAMS = testlk
27diff --git a/tools/rpcgen/Makefile.am b/tools/rpcgen/Makefile.am
28index 8a9ec89..3e092c9 100644
29--- a/tools/rpcgen/Makefile.am
30+++ b/tools/rpcgen/Makefile.am
31@@ -1,6 +1,5 @@
32 ## Process this file with automake to produce Makefile.in
33
34-CC=$(CC_FOR_BUILD)
35 LIBTOOL = @LIBTOOL@ --tag=CC
36
37 noinst_PROGRAMS = rpcgen
38--
392.11.0
40
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
deleted file mode 100644
index 993f1e5ea5..0000000000
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch
+++ /dev/null
@@ -1,42 +0,0 @@
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_2.3.3.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.3.bb
index 84530f698b..ac4437b925 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.3.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.3.bb
@@ -26,7 +26,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
26 file://nfs-mountd.service \ 26 file://nfs-mountd.service \
27 file://nfs-statd.service \ 27 file://nfs-statd.service \
28 file://proc-fs-nfsd.mount \ 28 file://proc-fs-nfsd.mount \
29 file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \
30 file://nfs-utils-debianize-start-statd.patch \ 29 file://nfs-utils-debianize-start-statd.patch \
31 file://bugfix-adjust-statd-service-name.patch \ 30 file://bugfix-adjust-statd-service-name.patch \
32 file://nfs-utils-musl-limits.patch \ 31 file://nfs-utils-musl-limits.patch \
@@ -35,6 +34,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
35 file://clang-format-string.patch \ 34 file://clang-format-string.patch \
36 file://0001-Makefile.am-update-the-path-of-libnfs.a.patch \ 35 file://0001-Makefile.am-update-the-path-of-libnfs.a.patch \
37 file://0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch \ 36 file://0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch \
37 file://0001-Don-t-build-tools-with-CC_FOR_BUILD.patch \
38" 38"
39SRC_URI_append_libc-glibc = " file://0001-configure.ac-Do-not-fatalize-Wmissing-prototypes.patch" 39SRC_URI_append_libc-glibc = " file://0001-configure.ac-Do-not-fatalize-Wmissing-prototypes.patch"
40SRC_URI_append_libc-musl = " file://nfs-utils-musl-res_querydomain.patch" 40SRC_URI_append_libc-musl = " file://nfs-utils-musl-res_querydomain.patch"
@@ -147,11 +147,6 @@ do_install_append () {
147 chown -R rpcuser:rpcuser ${D}${localstatedir}/lib/nfs/statd 147 chown -R rpcuser:rpcuser ${D}${localstatedir}/lib/nfs/statd
148 chmod 0644 ${D}${localstatedir}/lib/nfs/statd/state 148 chmod 0644 ${D}${localstatedir}/lib/nfs/statd/state
149 149
150 # the following are built by CC_FOR_BUILD
151 rm -f ${D}${sbindir}/rpcdebug
152 rm -f ${D}${sbindir}/rpcgen
153 rm -f ${D}${sbindir}/locktest
154
155 # Make python tools use python 3 150 # Make python tools use python 3
156 sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${sbindir}/mountstats ${D}${sbindir}/nfsiostat 151 sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${sbindir}/mountstats ${D}${sbindir}/nfsiostat
157 152