Skip to contentSkip to conversation

package/ltp-testsuite: fix build with musl-fts

PATCH New Fabrice Fontaine 3 participants 3 messages Oct 11, 2019 – Oct 12, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/ltp-testsuite: fix build with musl-fts

Fixes:
- http://autobuild.buildroot.org/results/7a4b54768584b2ec95f7f5c0932d0161ab8e43d5

---
 package/ltp-testsuite/Config.in        | 1 +
 package/ltp-testsuite/ltp-testsuite.mk | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)
package/ltp-testsuite/Config.in +1 -0
index 711c859e6c..500a8c2688 100644
@@ -15,6 +15,7 @@ config BR2_PACKAGE_LTP_TESTSUITE
 	depends on !BR2_TOOLCHAIN_USES_MUSL
 	depends on BR2_PACKAGE_LTP_TESTSUITE_ARCH_SUPPORTS
 	select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC
 	help
 	  The Linux Test Project provides a huge testsuite for Linux.
 
package/ltp-testsuite/ltp-testsuite.mk +6 -1
index 2276b75f8c..0c850d2b67 100644
@@ -51,13 +51,18 @@ LTP_TESTSUITE_CFLAGS += "`$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`"
 LTP_TESTSUITE_LIBS += "`$(PKG_CONFIG_HOST_BINARY) --libs libtirpc`"
 endif
 
+ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),)
+LTP_TESTSUITE_DEPENDENCIES += musl-fts
+LTP_TESTSUITE_LIBS += -lfts
+endif
+
 LTP_TESTSUITE_CONF_ENV += \
 	CFLAGS="$(LTP_TESTSUITE_CFLAGS)" \
 	CPPFLAGS="$(LTP_TESTSUITE_CPPFLAGS)" \
 	LIBS="$(LTP_TESTSUITE_LIBS)" \
 	SYSROOT="$(STAGING_DIR)"
 
-# Requires uClibc fts and bessel support, normally not enabled
+# Requires uClibc bessel support, normally not enabled
 ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
 define LTP_TESTSUITE_REMOVE_UNSUPPORTED
 	rm -rf $(@D)/testcases/misc/math/float/bessel/
Signature · 1 line
2.23.0
#1 lore raw

PATCH 1/1 package/ltp-testsuite: fix build with musl-fts

Quoted 4 lines · Fabrice Fontaine

Fixes:
- http://autobuild.buildroot.org/results/7a4b54768584b2ec95f7f5c0932d0161ab8e43d5

Applied to master, thanks.

I notice that ltp-testsuite still has a workaround to disable largefile since
it's incompatible with fts. However, that has been fixed in glibc 2.23, released 2016-02-19. Other packages (e.g. libzip) don't have such a workaround.

I wonder what we should do with that. Remove the existing workarounds? Wait a
few years until old external toolchains with glibc pre-2.23 have died out? Add the workaround to all packages?

Regards,
Arnout

Quoted 42 lines
---
 package/ltp-testsuite/Config.in        | 1 +
 package/ltp-testsuite/ltp-testsuite.mk | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)
package/ltp-testsuite/Config.in +1 -0
index 711c859e6c..500a8c2688 100644
@@ -15,6 +15,7 @@ config BR2_PACKAGE_LTP_TESTSUITE
 	depends on !BR2_TOOLCHAIN_USES_MUSL
 	depends on BR2_PACKAGE_LTP_TESTSUITE_ARCH_SUPPORTS
 	select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC
 	help
 	  The Linux Test Project provides a huge testsuite for Linux.
 
package/ltp-testsuite/ltp-testsuite.mk +6 -1
index 2276b75f8c..0c850d2b67 100644
@@ -51,13 +51,18 @@ LTP_TESTSUITE_CFLAGS += "`$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`"
 LTP_TESTSUITE_LIBS += "`$(PKG_CONFIG_HOST_BINARY) --libs libtirpc`"
 endif
 
+ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),)
+LTP_TESTSUITE_DEPENDENCIES += musl-fts
+LTP_TESTSUITE_LIBS += -lfts
+endif
+
 LTP_TESTSUITE_CONF_ENV += \
 	CFLAGS="$(LTP_TESTSUITE_CFLAGS)" \
 	CPPFLAGS="$(LTP_TESTSUITE_CPPFLAGS)" \
 	LIBS="$(LTP_TESTSUITE_LIBS)" \
 	SYSROOT="$(STAGING_DIR)"
 
-# Requires uClibc fts and bessel support, normally not enabled
+# Requires uClibc bessel support, normally not enabled
 ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
 define LTP_TESTSUITE_REMOVE_UNSUPPORTED
 	rm -rf $(@D)/testcases/misc/math/float/bessel/
#2 lore raw

PATCH 1/1 package/ltp-testsuite: fix build with musl-fts

In reply to Fabrice Fontaine

Hi Fabrice,

Quoted 4 lines

Fixes:
- http://autobuild.buildroot.org/results/7a4b54768584b2ec95f7f5c0932d0161ab8e43d5

Too late to ack this, so at least thanks for implementing it :)..

It'd make sense to note, that this fixes build for uclibc
without UCLIBC_HAS_FTS.
MUSL (if it had LTP support) wouldn't suffer this error (compilation would be skipped due missing fts.h).

Kind regards,
Petr