From patchwork Fri Jul 24 20:08:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas De Schampheleire X-Patchwork-Id: 499865 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 1620714030C for ; Sat, 25 Jul 2015 06:08:34 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=fxuyiLjW; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5CD2E8BB85; Fri, 24 Jul 2015 20:08:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NVNZCFCfCr94; Fri, 24 Jul 2015 20:08:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 82CA38BB1F; Fri, 24 Jul 2015 20:08:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id D94101C2033 for ; Fri, 24 Jul 2015 20:08:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D20F4236B2 for ; Fri, 24 Jul 2015 20:08:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id M98b+bmtpv+I for ; Fri, 24 Jul 2015 20:08:28 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by silver.osuosl.org (Postfix) with ESMTPS id E5296200E5 for ; Fri, 24 Jul 2015 20:08:27 +0000 (UTC) Received: by wibxm9 with SMTP id xm9so42742036wib.0 for ; Fri, 24 Jul 2015 13:08:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=HRsqVs1e6XgHrd21ga+pbGF+AQJ0zAADMDMEenBB1eU=; b=fxuyiLjWQo0+1XPYZksfNuAOIOu69zddc+kY6P1aE85ljpaggfS5Uxb6hsObRU7nS8 iRLOcYyp6uZOB58KmGgZAZOeFVZMpH9svY1eKeRytEIdw5RjbfueGjhPIzs4UUo0Sg7N izQ6D4ccl5aId+V6jyMDFtWjGpOOPUjYi/KXEKstlslnywjt1rTmlCSTm9I+jZ+bVgyC 1lXnX12sixfvuLWC+RpL8On4pEB1e9uS0XLQE3dvpD33AiUqnVFGBmaH9OFcIRdQk0IE gg+GQ+Qnm83BLW224943g9+BpnN7qySkFfI+qzeOYGW2EwZr8VPsseZGnMPEwhfhhEcG snbQ== X-Received: by 10.180.198.178 with SMTP id jd18mr271367wic.14.1437768506527; Fri, 24 Jul 2015 13:08:26 -0700 (PDT) Received: from localhost.localdomain (d54C49339.access.telenet.be. [84.196.147.57]) by smtp.gmail.com with ESMTPSA id pf4sm14208363wjb.23.2015.07.24.13.08.25 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 24 Jul 2015 13:08:25 -0700 (PDT) From: Thomas De Schampheleire To: buildroot@buildroot.org Date: Fri, 24 Jul 2015 22:08:07 +0200 Message-Id: <1437768487-27179-1-git-send-email-patrickdepinguin@gmail.com> X-Mailer: git-send-email 1.8.5.1 Cc: thomas.petazzoni@free-electrons.com, Rich Felker , Thomas De Schampheleire Subject: [Buildroot] [PATCH 1/1] ltp-testsuite: support building with toolchains without native RPC X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Thomas De Schampheleire 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 --- 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 # 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" depends on !BR2_nios2 depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HAS_NATIVE_RPC + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL 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 , 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 +endif + LTP_TESTSUITE_CONF_ENV += \ - CFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS))" \ - CPPFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS))" + CFLAGS="$(LTP_TESTSUITE_CFLAGS)" \ + CPPFLAGS="$(LTP_TESTSUITE_CPPFLAGS)" \ + LDFLAGS="$(LTP_TESTSUITE_LDFLAGS)" $(eval $(autotools-package))