From patchwork Mon Oct 14 16:53:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1176510 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VY6gLafW"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46sPmN52F5z9sP3 for ; Tue, 15 Oct 2019 03:54:28 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E51662268D; Mon, 14 Oct 2019 16:54:25 +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 7-Cv2fmQOk2t; Mon, 14 Oct 2019 16:54:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 924BE204ED; Mon, 14 Oct 2019 16:54:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 493C01BF27A for ; Mon, 14 Oct 2019 16:54:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 46AF2860E0 for ; Mon, 14 Oct 2019 16:54:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DPkIyf5y4CV0 for ; Mon, 14 Oct 2019 16:54:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 3866985758 for ; Mon, 14 Oct 2019 16:54:21 +0000 (UTC) Received: by mail-wm1-f50.google.com with SMTP id m18so17462493wmc.1 for ; Mon, 14 Oct 2019 09:54:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lhCFv+TQUdCA2QMQg00KYUGBeIZPSVgl3qzk74ogcfE=; b=VY6gLafWMMOs2HYzdwRCWegWxDBu+7nkvjPRC7c9el/cr+vG2nINwmvtyNC8UCscjf cMpQJYNdMmiClfcTeoqJe6kLrbnOZ398IiA5xACfOBboUV+SbcCq3CHyzdKzUuMgYXLs deUi3B4YpVlzCS0Rg3iFUiN/8u37HkbRslGpmvHSpP8/Mzup4epGPgO3tpCxFJyQLLOT I4yWVwz67G+04zUeVsVtAdPmxzziGqX903BtCIVma9lNtSp9IWql6AgnDuAELqRJ4vna vICrRhZAltWRqsSIfCuXgg8ovcL6fOx1s2qgPw17qfectsREMc539i3IQHmfDCf+QENS 4T0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lhCFv+TQUdCA2QMQg00KYUGBeIZPSVgl3qzk74ogcfE=; b=QzHKUWA+4TNeBx+AjbtLT5hpAxFUtn9fIkaG7xM0D2hoGsY3bKENNYFLKDvK6SNfeS SnMDoMzWCdlnbSjAHuBxa24v+NZ0TlktaOE6MUKmP6sFTdlxSsRNnPOABic07vwvTXS7 tiAD+d6dOqY3jL+RXQHarW3Z26JwwSnc9SOPDEuZhuGbC2QsB/36M1XhIqWiyV5hFXKE ER/dH+bqr+E8yDIuNGBtGZQ8+JunHNlwGyiWRXJdE08B9R4hOCcybpghvWp9bUlxlRQT oN+I3ZNlurI3EViF1oaUTPif2DBE2F25nyFaf7dyXvVK7fuHZ5cqiU5FN5rCcg5HxWBY ZVew== X-Gm-Message-State: APjAAAU4EQwPwm3JLF/PEdL8T3XV2SDi2nCkW+YN7P5Q+U4SpbxQ0i+z 2ER2Nxk1yl3g9XryofeCsZi4fbX5 X-Google-Smtp-Source: APXvYqzO1eU2T0k/XNz3d4waP/nVZUv4xkxN/2tgn9NLzuhz3ypamiAihmiSYeS+jH1IuSXm4h62Aw== X-Received: by 2002:a05:600c:2185:: with SMTP id e5mr3195180wme.78.1571072059224; Mon, 14 Oct 2019 09:54:19 -0700 (PDT) Received: from kali.home (lfbn-1-3732-187.w86-229.abo.wanadoo.fr. [86.229.230.187]) by smtp.gmail.com with ESMTPSA id s10sm35504199wmf.48.2019.10.14.09.54.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Oct 2019 09:54:18 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Mon, 14 Oct 2019 18:53:35 +0200 Message-Id: <20191014165335.4884-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/ltp-testsuite: fix static build with lts-musl X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: - http://autobuild.buildroot.org/results/9155326e1ff7c2bb2218122c453872c2fc76f65e Signed-off-by: Fabrice Fontaine --- ...-to-fix-static-linking-with-musl-fts.patch | 48 +++++++++++++++++++ package/ltp-testsuite/ltp-testsuite.mk | 2 +- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 package/ltp-testsuite/0003-Add-FTS_LIBS-to-fix-static-linking-with-musl-fts.patch diff --git a/package/ltp-testsuite/0003-Add-FTS_LIBS-to-fix-static-linking-with-musl-fts.patch b/package/ltp-testsuite/0003-Add-FTS_LIBS-to-fix-static-linking-with-musl-fts.patch new file mode 100644 index 0000000000..ddfc423af5 --- /dev/null +++ b/package/ltp-testsuite/0003-Add-FTS_LIBS-to-fix-static-linking-with-musl-fts.patch @@ -0,0 +1,48 @@ +From 12fbf9d051f13477ca560ba174362e8b0f4d446b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 14 Oct 2019 11:47:49 +0200 +Subject: [PATCH] Add FTS_LIBS to fix static linking with musl-fts + +Add FTS_LIBS to cpuset_lib/Makefile and cpuset/Makefile.inc to allow the +user to provide its FTS library such as -lfts for musl/uclibc + +This will fix static build of ltp with musl-fts on uclibc + +Fixes: + - http://autobuild.buildroot.org/results/9155326e1ff7c2bb2218122c453872c2fc76f65e + +Signed-off-by: Fabrice Fontaine +--- + testcases/kernel/controllers/cpuset/Makefile.inc | 2 +- + testcases/kernel/controllers/cpuset/cpuset_lib/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/testcases/kernel/controllers/cpuset/Makefile.inc b/testcases/kernel/controllers/cpuset/Makefile.inc +index db6a84305..65967c85b 100644 +--- a/testcases/kernel/controllers/cpuset/Makefile.inc ++++ b/testcases/kernel/controllers/cpuset/Makefile.inc +@@ -41,7 +41,7 @@ MAKE_DEPS := $(LIBCONTROLLERS) $(LIBCPUSET) + + LDFLAGS += -L$(abs_builddir)/$(LIBCPUSET_DIR) -L$(abs_builddir)/$(LIBCONTROLLERS_DIR) + +-LDLIBS += -lcpu_set -lcontrollers -lltp ++LDLIBS += -lcpu_set -lcontrollers -lltp $(FTS_LIBS) + + INSTALL_TARGETS ?= *.sh + +diff --git a/testcases/kernel/controllers/cpuset/cpuset_lib/Makefile b/testcases/kernel/controllers/cpuset/cpuset_lib/Makefile +index 322d03cac..2f9f93c69 100644 +--- a/testcases/kernel/controllers/cpuset/cpuset_lib/Makefile ++++ b/testcases/kernel/controllers/cpuset/cpuset_lib/Makefile +@@ -25,7 +25,7 @@ top_srcdir ?= ../../../../.. + + include $(top_srcdir)/include/mk/testcases.mk + +-LDLIBS += -lm -lcontrollers -lltp ++LDLIBS += -lm -lcontrollers -lltp $(FTS_LIBS) + + LIB := libcpu_set.a + +-- +2.23.0 + diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index 0c850d2b67..57099f606d 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -53,7 +53,7 @@ endif ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) LTP_TESTSUITE_DEPENDENCIES += musl-fts -LTP_TESTSUITE_LIBS += -lfts +LTP_TESTSUITE_MAKE_OPTS += FTS_LIBS=-lfts endif LTP_TESTSUITE_CONF_ENV += \