[Buildroot] [PATCH] ltp-testsuite: Fix uClibc build with disabled fts.h support

Nikita Sobolev Nikita.Sobolev at synopsys.com
Wed Apr 17 13:54:58 UTC 2019


Add patch, that fixes build on uClibc with disabled fts.h support
and MUSL, which does not have fts.h at all.

Original patch [1] will be a part of the next LTP release and
current patch should be removed from Buildroot when LTP version
is bumped.

[1] https://github.com/linux-test-project/ltp/commit/b24f3d32c54006af5499da5a7ac418eafcf6e459

Signed-off-by: Nikita Sobolev <Nikita.Sobolev at synopsys.com>
---
 .../0002-cpuset-Detect-missing-fts.h.patch         | 76 ++++++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 package/ltp-testsuite/0002-cpuset-Detect-missing-fts.h.patch

diff --git a/package/ltp-testsuite/0002-cpuset-Detect-missing-fts.h.patch b/package/ltp-testsuite/0002-cpuset-Detect-missing-fts.h.patch
new file mode 100644
index 0000000000..22d954ba51
--- /dev/null
+++ b/package/ltp-testsuite/0002-cpuset-Detect-missing-fts.h.patch
@@ -0,0 +1,76 @@
+From b24f3d32c54006af5499da5a7ac418eafcf6e459 Mon Sep 17 00:00:00 2001
+From: Petr Vorel <petr.vorel at gmail.com>
+Date: Thu, 21 Mar 2019 22:08:31 +0100
+Subject: [PATCH] cpuset: Detect missing fts.h
+
+This fixes build on uClibc with disabled fts.h support and MUSL, which
+does not have fts.h at all.
+
+Reported-by: Vineet Gupta <vgupta at synopsys.com>
+Signed-off-by: Petr Vorel <petr.vorel at gmail.com>
+[Nikita:
+ - back-ported to ltp-full-20190115 release]
+Signed-off-by: Nikita Sobolev <Nikita.Sobolev at synopsys.com>
+---
+ configure.ac                          | 1 +
+ include/mk/config.mk.in               | 1 +
+ m4/ltp-fts.m4                         | 7 +++++++
+ testcases/kernel/controllers/Makefile | 4 ++++
+ 4 files changed, 13 insertions(+)
+ create mode 100644 m4/ltp-fts.m4
+
+diff --git a/configure.ac b/configure.ac
+index e002c248e..f05db9d2e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -231,6 +231,7 @@ LTP_CHECK_TPACKET_V3
+ LTP_CHECK_RLIMIT64
+ LTP_DETECT_HOST_CPU
+ LTP_CHECK_PERF_EVENT
++LTP_CHECK_FTS_H
+ 
+ if test "x$with_numa" = xyes; then
+ 	LTP_CHECK_SYSCALL_NUMA
+diff --git a/include/mk/config.mk.in b/include/mk/config.mk.in
+index 01f178bff..d55fe9602 100644
+--- a/include/mk/config.mk.in
++++ b/include/mk/config.mk.in
+@@ -46,6 +46,7 @@ SELINUX_LIBS		:= @SELINUX_LIBS@
+ TIRPC_CPPFLAGS		:= @TIRPC_CPPFLAGS@
+ TIRPC_LIBS		:= @TIRPC_LIBS@
+ KEYUTILS_LIBS		:= @KEYUTILS_LIBS@
++HAVE_FTS_H		:= @HAVE_FTS_H@
+ 
+ prefix			:= @prefix@
+ 
+diff --git a/m4/ltp-fts.m4 b/m4/ltp-fts.m4
+new file mode 100644
+index 000000000..0da692f23
+--- /dev/null
++++ b/m4/ltp-fts.m4
+@@ -0,0 +1,7 @@
++dnl SPDX-License-Identifier: GPL-2.0-or-later
++dnl Copyright (c) 2019 Petr Vorel <petr.vorel at gmail.com>
++
++AC_DEFUN([LTP_CHECK_FTS_H],[
++	AC_CHECK_HEADERS(fts.h, [have_fts=1])
++	AC_SUBST(HAVE_FTS_H, $have_fts)
++])
+diff --git a/testcases/kernel/controllers/Makefile b/testcases/kernel/controllers/Makefile
+index 404073947..548692cb8 100644
+--- a/testcases/kernel/controllers/Makefile
++++ b/testcases/kernel/controllers/Makefile
+@@ -29,6 +29,10 @@ LIBDIR			:= libcontrollers
+ LIB			:= $(LIBDIR)/libcontrollers.a
+ FILTER_OUT_DIRS		:= $(LIBDIR)
+ 
++ifneq ($(HAVE_FTS_H),1)
++	FILTER_OUT_DIRS += cpuset
++endif
++
+ $(LIBDIR):
+ 	mkdir -p "$@"
+ 
+-- 
+2.17.1
+
-- 
2.16.2



More information about the buildroot mailing list