From patchwork Sun Sep 22 09:06:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1165709 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.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46bhRg5xy3z9sNw for ; Sun, 22 Sep 2019 19:07:27 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 32D8586E2C; Sun, 22 Sep 2019 09:07:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PAa0vY47isVE; Sun, 22 Sep 2019 09:07:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 818A186E5B; Sun, 22 Sep 2019 09:07: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 6D7CD1BF423 for ; Sun, 22 Sep 2019 09:07:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 59E6F85429 for ; Sun, 22 Sep 2019 09:07:09 +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 m2WxBBAmSyin for ; Sun, 22 Sep 2019 09:07:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 68600849A3 for ; Sun, 22 Sep 2019 09:07:08 +0000 (UTC) X-Originating-IP: 90.76.216.45 Received: from localhost (lfbn-1-2159-45.w90-76.abo.wanadoo.fr [90.76.216.45]) (Authenticated sender: thomas.petazzoni@bootlin.com) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id AB858240002; Sun, 22 Sep 2019 09:07:06 +0000 (UTC) From: Thomas Petazzoni To: Adam Duskett , Clayton Shotwell , Matt Weber , Marcus Folkesson , Buildroot List Date: Sun, 22 Sep 2019 11:06:26 +0200 Message-Id: <20190922090646.15130-11-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190922090646.15130-1-thomas.petazzoni@bootlin.com> References: <20190922090646.15130-1-thomas.petazzoni@bootlin.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 10/30] package/libselinux: allow building on !glibc using musl-fts 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: Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Thomas Petazzoni --- package/libselinux/Config.in | 8 +++----- package/libselinux/libselinux.mk | 5 +++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/package/libselinux/Config.in b/package/libselinux/Config.in index 6be816db77..8cebd34fb2 100644 --- a/package/libselinux/Config.in +++ b/package/libselinux/Config.in @@ -2,12 +2,11 @@ config BR2_PACKAGE_LIBSELINUX bool "libselinux" depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS - # Uses , not available in musl or uClibc - depends on BR2_TOOLCHAIN_USES_GLIBC # Toolchain issue: "fixup not contained within frag" depends on !BR2_arc select BR2_PACKAGE_LIBSEPOL select BR2_PACKAGE_PCRE + select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC help libselinux is the runtime SELinux library that provides interfaces (e.g. library functions for the SELinux kernel @@ -19,7 +18,6 @@ config BR2_PACKAGE_LIBSELINUX http://selinuxproject.org/page/Main_Page -comment "libselinux needs a glibc toolchain w/ threads, dynamic library" +comment "libselinux needs a toolchain w/ threads, dynamic library" depends on !BR2_arc - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_USES_GLIBC + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index 977f9e2e8b..c707c8a25e 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -25,6 +25,11 @@ LIBSELINUX_MAKE_OPTS = \ LIBSELINUX_MAKE_INSTALL_TARGETS = install +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) +LIBSELINUX_DEPENDENCIES += musl-fts +LIBSELINUX_MAKE_OPTS += FTS_LDLIBS=-lfts +endif + ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBSELINUX_DEPENDENCIES += python3 host-swig