[Buildroot] [PATCH 1/1] ltp-testsuite: support building with toolchains without native RPC

[Yann E. MORIN <yann.morin.1998@free.fr>]

Thomas, All,

On 2015-07-24 22:08 +0200, Thomas De Schampheleire spake thusly:
> From: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
> 
> ltp-testsuite needs RPC, but this could also be provided by libtirpc.
> 
> Since musl toolchains never have RPC support, this change would now allow
> building of ltp-testsuite on musl toolchains. Unfortunately, ltp-testsuite
> does not build yet with musl, so a specific check on musl is added.
> 
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
> ---
>  package/ltp-testsuite/Config.in        |  7 ++++---
>  package/ltp-testsuite/ltp-testsuite.mk | 14 ++++++++++++--
>  2 files changed, 16 insertions(+), 5 deletions(-)
> 
> diff --git a/package/ltp-testsuite/Config.in b/package/ltp-testsuite/Config.in
> index 52c02ce..91b09ce 100644
> --- a/package/ltp-testsuite/Config.in
> +++ b/package/ltp-testsuite/Config.in
> @@ -6,7 +6,8 @@ config BR2_PACKAGE_LTP_TESTSUITE
>  	bool "ltp-testsuite"
>  	depends on BR2_USE_MMU # fork()
>  	depends on BR2_TOOLCHAIN_HAS_THREADS
> -	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
> +	depends on !BR2_TOOLCHAIN_USES_MUSL
> +	select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC

libtirpc depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 so I
wonder why you did not propagate this dependency here.

However, that is not necessary, since that toolchain does provide native
RPC, so we would not be selecting libtirpc with that toolchain.

Maybe worth a comment?

>  	# does not build, cachectl.h issue
>  	depends on !BR2_nios2
>  	help
> @@ -21,7 +22,7 @@ config BR2_PACKAGE_LTP_TESTSUITE
>  
>  	  http://ltp.sourceforge.net/
>  
> -comment "ltp-testsuite needs a toolchain w/ RPC, threads"
> +comment "ltp-testsuite needs a non-musl toolchain w/ threads"

We usually use positive logic, like in samab4, libunwind or vlc:

    comment "ltp-testsuite needs an (e)glibc or uClibc toolchain w/ threads"

> diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk
> index 2d4f286..05ffaf1 100644
> --- a/package/ltp-testsuite/ltp-testsuite.mk
> +++ b/package/ltp-testsuite/ltp-testsuite.mk
> @@ -19,8 +19,18 @@ endif
>  
>  # ltp-testsuite uses <fts.h>, which isn't compatible with largefile
>  # support.
> +LTP_TESTSUITE_CFLAGS = $(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS))
> +LTP_TESTSUITE_CPPFLAGS = $(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS))
> +
> +ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
> +LTP_TESTSUITE_DEPENDENCIES += libtirpc
> +LTP_TESTSUITE_CFLAGS += -I$(STAGING_DIR)/usr/include/tirpc/
> +LTP_TESTSUITE_LDFLAGS += -ltirpc

libtirpc install a .pc file, so why not use it, as in:

    LTP_TESTSUITE_DEPENDENCIES += libtirpc host-pkgconf
    LTP_TESTSUITE_CFLAGS += `$(HOST_PKG_CONFIG_BINARY) --cflags libtirpc`
    LTP_TESTSUITE_LDFLAGS += `$(HOST_PKG_COFNIG_BINARY) --libs libtirpc`

Shoehorn a --static when needed, too, for good measure.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'