From patchwork Wed Sep 28 16:00:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Roberts, William C" X-Patchwork-Id: 9354141 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6596960757 for ; Wed, 28 Sep 2016 16:00:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 52B552972D for ; Wed, 28 Sep 2016 16:00:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 440192972F; Wed, 28 Sep 2016 16:00:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from emsm-gh1-uea11.nsa.gov (smtp.nsa.gov [8.44.101.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 63BAF2972D for ; Wed, 28 Sep 2016 16:00:54 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.30,410,1470700800"; d="scan'208";a="19629504" IronPort-PHdr: =?us-ascii?q?9a23=3AW0jSqBJlH5u8WKkmC9mcpTZWNBhigK39O0sv0rFi?= =?us-ascii?q?tYgUI/zxwZ3uMQTl6Ol3ixeRBMOAuqgC0rWd4vuocFdDyK7JiGoFfp1IWk1Nou?= =?us-ascii?q?QttCtkPvS4D1bmJuXhdS0wEZcKflZk+3amLRodQ56mNBXsq3G/pQQfBg/4fVIs?= =?us-ascii?q?YL+kQMiL0I/mjKibwN76W01wnj2zYLd/fl2djD76kY0ou7ZkMbs70RDTo3FFKK?= =?us-ascii?q?x8zGJsIk+PzV6nvp/jtKN592xsn95pt4sZCeSpN5g/GKdVCDUgLnAd+NzgtR6F?= =?us-ascii?q?SxCGoHQbTCFeiRdBBQTf6xD2G5PwqTfSqvt22C7cO9b/C78zR3Dq9KtwYAP5gy?= =?us-ascii?q?cAcTgi+SfYjdIjorhcpUe+phh7wofRJorTLv10c7nBZvsbQ3ZMWoBaUCkSUcuH?= =?us-ascii?q?c4ITAr9Zbq5jpI7nqg5L9EOz?= X-IPAS-Result: =?us-ascii?q?A2HmBAB26OtX/wHyM5BdHAEBBAEBCgEBFwEBBAEBCgEBgxQ?= =?us-ascii?q?BAQEBAR6BU6YFlEcih25MAQEBAQEBAQECAQJbJ4IyBAMTBYIYAjcUIA4DCQIXC?= =?us-ascii?q?CEICAMBLRUYBwsFGASILL1IiDuGZhEBhXoFmXaPawKJe4VvSJAhVIUlVgGFEXi?= =?us-ascii?q?BKAEBAQ?= Received: from unknown (HELO tarius.tycho.ncsc.mil) ([144.51.242.1]) by emsm-gh1-uea11.nsa.gov with ESMTP; 28 Sep 2016 16:00:49 +0000 Received: from prometheus.infosec.tycho.ncsc.mil (prometheus [192.168.25.40]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id u8SG0VZw003725; Wed, 28 Sep 2016 12:00:36 -0400 Received: from tarius.tycho.ncsc.mil (tarius.infosec.tycho.ncsc.mil [144.51.242.1]) by prometheus.infosec.tycho.ncsc.mil (8.15.2/8.15.2) with ESMTP id u8SG0Tde003954 for ; Wed, 28 Sep 2016 12:00:29 -0400 Received: from goalie.tycho.ncsc.mil (goalie [144.51.242.250]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id u8SG0Tuo003718; Wed, 28 Sep 2016 12:00:29 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A1DWCAAp6OtX/yNjr8ZdGgEBAQECAQEBAQgBAQEBgz8BAQEBAR6BU7ZAhBUUhgqBaUwBAgEBAQEBAl5oDAGFEzCBDxKITb1UiDuMcgWZdo9rAo9qSJAhVIJNglhWAYNEg20BAQE X-IPAS-Result: A1DWCAAp6OtX/yNjr8ZdGgEBAQECAQEBAQgBAQEBgz8BAQEBAR6BU7ZAhBUUhgqBaUwBAgEBAQEBAl5oDAGFEzCBDxKITb1UiDuMcgWZdo9rAo9qSJAhVIJNglhWAYNEg20BAQE X-IronPort-AV: E=Sophos;i="5.30,410,1470715200"; d="scan'208";a="5733882" Received: from emsm-gh1-uea11.corp.nsa.gov (HELO emsm-gh1-uea11.nsa.gov) ([10.208.41.37]) by goalie.tycho.ncsc.mil with ESMTP; 28 Sep 2016 12:00:29 -0400 IronPort-PHdr: =?us-ascii?q?9a23=3AbIOYkxNDZlz8FMEk0gsl6mtUPXoX/o7sNwtQ0KIM?= =?us-ascii?q?zox0Kf3+rarrMEGX3/hxlliBBdydsKMezbOJ+PG7EUU7or+5+EgYd5JNUxJXwe?= =?us-ascii?q?43pCcHRPC/NEvgMfTxZDY7FskRHHVs/nW8LFQHUJ2mPw6anHS+4HYoFwnlMkIt?= =?us-ascii?q?f6KuS9SU1pv8hrv60qaQSj0AvCC6b7J2IUf+hiTqne5Sv7FfLL0swADCuHpCdr?= =?us-ascii?q?ce72ppIVWOg0S0vZ/or9ZLuh5dsPM59sNGTb6yP+FhFeQZXwIdNHop6cHRuBLC?= =?us-ascii?q?VVHHpidEEzZerh0dGAXB7RfnTr/toyD6sax7wyDcMsroCfgvVD2k471sSROtjC?= =?us-ascii?q?YcKxYl4WrXjYp2l6sdrxW/41Rkz5X8fJCeNP04eLjUO9wdWzlvRMFUAjNABoe9?= =?us-ascii?q?Zo5JBKwbOuxVtZXmj1oIsRa6QwKrAbC8ggRUj2P7iPVpm98qFhvLiUl+R98=3D?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A0E/CgB26OtX/yNjr8ZdGwEBAQMBAQEJA?= =?us-ascii?q?QEBFwEBBAEBCgEBgxQBAQEBAR6BU6YFkDuEFRSGCoFpTAEBAQEBAQEBAgECWyd?= =?us-ascii?q?BDAGBZAQBFQWDEDCBDxKITb1IiDuMcgWZdo9rAo9qSJAhVIUlVgGDRIIsgUEBA?= =?us-ascii?q?QE?= X-IPAS-Result: =?us-ascii?q?A0E/CgB26OtX/yNjr8ZdGwEBAQMBAQEJAQEBFwEBBAEBCgE?= =?us-ascii?q?BgxQBAQEBAR6BU6YFkDuEFRSGCoFpTAEBAQEBAQEBAgECWydBDAGBZAQBFQWDE?= =?us-ascii?q?DCBDxKITb1IiDuMcgWZdo9rAo9qSJAhVIUlVgGDRIIsgUEBAQE?= X-IronPort-AV: E=Sophos;i="5.30,410,1470700800"; d="scan'208";a="19629480" Received: from fmsmga002-icc.fm.intel.com ([198.175.99.35]) by emsm-gh1-uea11.nsa.gov with ESMTP; 28 Sep 2016 16:00:27 +0000 Received: from fmsmga001-icc.fm.intel.com ([198.175.99.7]) by fmsmga002-icc.fm.intel.com with ESMTP; 28 Sep 2016 09:00:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.30,410,1470726000"; d="scan'208"; a="1047028764" Received: from egluckma-mobl1.amr.corp.intel.com (HELO wcrobert-MOBL1.amr.corp.intel.com) ([10.254.66.145]) by fmsmga001.fm.intel.com with ESMTP; 28 Sep 2016 09:00:27 -0700 From: william.c.roberts@intel.com To: selinux@tycho.nsa.gov, seandroid-list@tycho.nsa.gov, sds@tycho.nsa.gov Subject: [PATCH 1/2] libselinux: rename EMFLAGS to DISABLE_FLAGS Date: Wed, 28 Sep 2016 12:00:23 -0400 Message-Id: <1475078424-21486-1-git-send-email-william.c.roberts@intel.com> X-Mailer: git-send-email 1.9.1 X-BeenThere: selinux@tycho.nsa.gov X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Security-Enhanced Linux \(SELinux\) mailing list" List-Post: List-Help: MIME-Version: 1.0 Errors-To: selinux-bounces@tycho.nsa.gov Sender: "Selinux" X-Virus-Scanned: ClamAV using ClamSMTP From: William Roberts Change EMFLAGS variable, used for setting additional CFLAGS to DISABLE_FLAGS, to indicate its usage better. Signed-off-by: William Roberts --- libselinux/Makefile | 6 +++--- libselinux/src/Makefile | 6 +++--- libselinux/utils/Makefile | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libselinux/Makefile b/libselinux/Makefile index bfeb4b8..41d836c 100644 --- a/libselinux/Makefile +++ b/libselinux/Makefile @@ -3,12 +3,12 @@ SUBDIRS = src include utils man DISABLE_SETRANS ?= n DISABLE_RPM ?= n ifeq ($(DISABLE_RPM),y) - EMFLAGS+= -DDISABLE_RPM + DISABLE_FLAGS+= -DDISABLE_RPM endif ifeq ($(DISABLE_SETRANS),y) - EMFLAGS+= -DDISABLE_SETRANS + DISABLE_FLAGS+= -DDISABLE_SETRANS endif -export DISABLE_SETRANS DISABLE_RPM EMFLAGS +export DISABLE_SETRANS DISABLE_RPM DISABLE_FLAGS USE_PCRE2 ?= n ifeq ($(USE_PCRE2),y) diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile index d8a79b4..7bf11a8 100644 --- a/libselinux/src/Makefile +++ b/libselinux/src/Makefile @@ -69,7 +69,7 @@ CFLAGS ?= -O -Wall -W -Wundef -Wformat-y2k -Wformat-security -Winit-self -Wmissi PCRE_LDFLAGS ?= -lpcre -override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE $(EMFLAGS) $(PCRE_CFLAGS) +override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE $(DISABLE_FLAGS) $(PCRE_CFLAGS) SWIG_CFLAGS += -Wno-error -Wno-unused-variable -Wno-unused-but-set-variable -Wno-unused-parameter \ -Wno-shadow -Wno-uninitialized -Wno-missing-prototypes -Wno-missing-declarations @@ -81,9 +81,9 @@ ifneq (,$(filter i386,$(ARCH))) TLSFLAGS += -mno-tls-direct-seg-refs endif -SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./ $(EMFLAGS) +SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./ $(DISABLE_FLAGS) -SWIGRUBY = swig -Wall -ruby -o $(SWIGRUBYCOUT) -outdir ./ $(EMFLAGS) +SWIGRUBY = swig -Wall -ruby -o $(SWIGRUBYCOUT) -outdir ./ $(DISABLE_FLAGS) all: $(LIBA) $(LIBSO) $(LIBPC) diff --git a/libselinux/utils/Makefile b/libselinux/utils/Makefile index 0708d6d..7898c08 100644 --- a/libselinux/utils/Makefile +++ b/libselinux/utils/Makefile @@ -24,7 +24,7 @@ CFLAGS ?= -O -Wall -W -Wundef -Wformat-y2k -Wformat-security -Winit-self -Wmissi -fasynchronous-unwind-tables -fdiagnostics-show-option -funit-at-a-time \ -fipa-pure-const -Wno-suggest-attribute=pure -Wno-suggest-attribute=const \ -Werror -Wno-aggregate-return -Wno-redundant-decls -override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE $(EMFLAGS) $(PCRE_CFLAGS) +override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE $(DISABLE_FLAGS) $(PCRE_CFLAGS) LDLIBS += -L../src -lselinux -L$(LIBDIR) PCRE_LDFLAGS ?= -lpcre