Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.5 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6F20C43441 for ; Sun, 18 Nov 2018 11:37:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 37C3D20671 for ; Sun, 18 Nov 2018 11:37:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=perfinion-com.20150623.gappssmtp.com header.i=@perfinion-com.20150623.gappssmtp.com header.b="12pRY4hi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 37C3D20671 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=perfinion.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=selinux-refpolicy-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726180AbeKRV5w (ORCPT ); Sun, 18 Nov 2018 16:57:52 -0500 Received: from mail-pf1-f193.google.com ([209.85.210.193]:36435 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726077AbeKRV5w (ORCPT ); Sun, 18 Nov 2018 16:57:52 -0500 Received: by mail-pf1-f193.google.com with SMTP id b85so6657153pfc.3 for ; Sun, 18 Nov 2018 03:37:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=perfinion-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=+NCRLkH3j8VaZznb8Gxs4jwsFz/aSlLDNLTH4f4dMEU=; b=12pRY4hiHJyO2xP7x7cmX4VyXaVwsiL8SnKk+38HR/hi/CZS+Nv3LM/UEb/YV81x2r uxYqZRdNz1N9YJyPXJFWUABqg8FSDM5qXvnDQZ3Hs8nXD+Ib46e3cnmTRf/KjE83l4eZ JwH6VTFiBm/7PbhIhU8A4i8acXTrW3Z1/SQ4C8QvwIS8X6q08p8vZ9GlR2i3t+xzI9iT 6LezuySf4/yKDTGpeG2ap7EvlJgHfnxS6VouPqS1TpbYqyjTYIoeYTKi39xlUr/xuIGp yWrKNBNK9/PWJ88ho5oQDlbALLyN/p1Qcc0iPinRn7jYwS3hJVadiUsz/9SENXNxDKDv bMVg== 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; bh=+NCRLkH3j8VaZznb8Gxs4jwsFz/aSlLDNLTH4f4dMEU=; b=nTABH8pUjKNcUQrQr8QGIQZtJ2ovK2J0P99bV8JdJyaYJU/DwAPsRslxTSwdbo/aVI MVVFgEfbs4+7SVIGe6DMRIBf+uV1Mr80r8B5uimLIwTwPIyOhYmCVWP0FjT+HccsqV1C wj1cKgymncIWOveArDmE4xB4/aUTzE9FxZl0StmhEFjBhfbbhQMhyoP+dg8OSg+/Vp9G Nuj9zYEgXkeIE00tuU4ynXVGYHYYPEZcgv8N4WgtRYApdfwTxTzQem/A7Kz7JFmaHvFG +kGpgoapy6QihZlZ61+Isc8SdnPKrTiCpsAxWY78nsj3XNXNYx15/qIyH27eusQbtzhc Rzgw== X-Gm-Message-State: AGRZ1gJ4d0qt/4WtfSG5wBA/KrcfR2snG0taEmUhsg0njik7gWcDrho0 kPsjnHLZZKE4ZPSUhZpUDVLHVpH/joQ= X-Google-Smtp-Source: AJdET5elodXWEEsqEk3bqzXiNqcYj98/01gtmyIZZiizOKeyueNxHPBTueZL6h1SI05gyj+SqbBKHw== X-Received: by 2002:a63:d441:: with SMTP id i1-v6mr16182183pgj.31.1542541065891; Sun, 18 Nov 2018 03:37:45 -0800 (PST) Received: from localhost ([2404:e800:e600:402:a043:dee9:8fe1:5766]) by smtp.gmail.com with ESMTPSA id g15sm78980843pfj.131.2018.11.18.03.37.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 18 Nov 2018 03:37:45 -0800 (PST) From: Jason Zaman To: selinux-refpolicy@vger.kernel.org Cc: Jason Zaman Subject: [PATCH 1/3] build: add config for libc gnu and musl Date: Sun, 18 Nov 2018 19:37:36 +0800 Message-Id: <20181118113738.29532-1-jason@perfinion.com> X-Mailer: git-send-email 2.18.1 Sender: selinux-refpolicy-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux-refpolicy@vger.kernel.org Signed-off-by: Jason Zaman --- Makefile | 7 +++++++ build.conf | 5 +++++ support/Makefile.devel | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/Makefile b/Makefile index 57d297c9..8e149345 100644 --- a/Makefile +++ b/Makefile @@ -192,6 +192,10 @@ ifeq "$(DISTRO)" "ubuntu" M4PARAM += -D distro_debian endif +ifneq ($(LIBC),) + M4PARAM += -D libc_$(LIBC) +endif + ifeq "$(SYSTEMD)" "y" M4PARAM += -D init_systemd endif @@ -541,6 +545,9 @@ install-headers: $(layerxml) $(tunxml) $(boolxml) $(verbose) echo "NAME ?= $(NAME)" >> $(headerdir)/build.conf ifneq "$(DISTRO)" "" $(verbose) echo "DISTRO ?= $(DISTRO)" >> $(headerdir)/build.conf +endif +ifneq "$(LIBC)" "" + $(verbose) echo "LIBC ?= $(LIBC)" >> $(headerdir)/build.conf endif $(verbose) echo "MONOLITHIC ?= n" >> $(headerdir)/build.conf $(verbose) echo "DIRECT_INITRC ?= $(DIRECT_INITRC)" >> $(headerdir)/build.conf diff --git a/build.conf b/build.conf index a2f1a9b5..add0fcf8 100644 --- a/build.conf +++ b/build.conf @@ -29,6 +29,11 @@ NAME = refpolicy # Fedora users should enable redhat. #DISTRO = redhat +# libc +# Setting this will configure which libc is used. +# gnu, musl are the current options. +LIBC = gnu + # Unknown Permissions Handling # The behavior for handling permissions defined in the # kernel but missing from the policy. The permissions diff --git a/support/Makefile.devel b/support/Makefile.devel index f3daca11..fb296084 100644 --- a/support/Makefile.devel +++ b/support/Makefile.devel @@ -58,6 +58,10 @@ ifneq ($(DISTRO),) M4PARAM += -D distro_$(DISTRO) endif +ifneq ($(LIBC),) + M4PARAM += -D libc_$(LIBC) +endif + ifeq "$(SYSTEMD)" "y" M4PARAM += -D init_systemd endif -- 2.18.1