From patchwork Thu Jun 2 06:49:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Bigonville X-Patchwork-Id: 9149283 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 EB7D060467 for ; Thu, 2 Jun 2016 06:50:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DE9E42654B for ; Thu, 2 Jun 2016 06:50:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D2F0028236; Thu, 2 Jun 2016 06:50:32 +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=-1.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from emsm-gh1-uea11.nsa.gov (emsm-gh1-uea11.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 A8E452654B for ; Thu, 2 Jun 2016 06:50:31 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.26,405,1459814400"; d="scan'208";a="16580764" IronPort-PHdr: =?us-ascii?q?9a23=3A6SCX3hJDD56n8lsteNmcpTZWNBhigK39O0sv0rFi?= =?us-ascii?q?tYgUL/XxwZ3uMQTl6Ol3ixeRBMOAu6MC1rqd6vm/EUU7or+/81k6OKRWUBEEjc?= =?us-ascii?q?hE1ycBO+WiTXPBEfjxciYhF95DXlI2t1uyMExSBdqsLwaK+i760zceF13FOBZv?= =?us-ascii?q?IaytQ8iJ35XxirD5osSMKyxzxxODIppKZC2sqgvQssREyaBDEY0WjiXzn31TZu?= =?us-ascii?q?5NznlpL1/A1zz158O34YIxu38I46FpytREGZneU+x4COUATWduD2dg/8DvtB/e?= =?us-ascii?q?XSOT93AcVSMQiRMODA/bvz/gWZKkliLnrOd7xGGwPMLxS641XTCvp/NhSRDvjg?= =?us-ascii?q?8LOjQ4+WeRjdZ/2vEI6Cm9rgByltaHKLqeM+BzK+aEJd4=3D?= X-IPAS-Result: =?us-ascii?q?A2GFCgA21k9X/wHyM5Begw4sVn2lcgUBAQEBAQEGgmgWAZM?= =?us-ascii?q?qIQOBc4U6TAEBAQEBAQICYieCMH5bRAI3BgEBDCAMAgMJAhcIIQgIAwEtCwofC?= =?us-ascii?q?wUYBIgOAQMBryeFKAEBBYxlARwIhV+JJxEBaIRyHJg8hgCCeIUoAoI1hyGFQgK?= =?us-ascii?q?CVox0AmKDb2yJR4E1AQEB?= Received: from unknown (HELO tarius.tycho.ncsc.mil) ([144.51.242.1]) by emsm-gh1-uea11.nsa.gov with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Jun 2016 06:50:28 +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 u526nTIH022437; Thu, 2 Jun 2016 02:49:44 -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 u526nQPQ034831 for ; Thu, 2 Jun 2016 02:49:26 -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 u526nQco022431 for ; Thu, 2 Jun 2016 02:49:26 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A1BmCAB61k9X/2OteVteKgGCYyxWNkeldwEBAQEBAQaSHYQoCIctTAEBAQEBAWYnhQwBATgvbTSIMAMBrymFKAEBBY0CCIVfiiGEchyYPIYAgniFKAKCNYxjAoJWjHQCYoFCgi1sinwBAQE X-IPAS-Result: A1BmCAB61k9X/2OteVteKgGCYyxWNkeldwEBAQEBAQaSHYQoCIctTAEBAQEBAWYnhQwBATgvbTSIMAMBrymFKAEBBY0CCIVfiiGEchyYPIYAgniFKAKCNYxjAoJWjHQCYoFCgi1sinwBAQE X-IronPort-AV: E=Sophos;i="5.26,405,1459828800"; d="scan'208";a="5483621" Received: from emsm-gh1-uea10.corp.nsa.gov (HELO emsm-gh1-uea10.nsa.gov) ([10.208.41.36]) by goalie.tycho.ncsc.mil with ESMTP; 02 Jun 2016 02:49:26 -0400 IronPort-PHdr: =?us-ascii?q?9a23=3AYaZishDgpomO3oHgtSadUyQJP3N1i/DPJgcQr6Af?= =?us-ascii?q?oPdwSP7/o8bcNUDSrc9gkEXOFd2CrakU2qyL4+u5ADNIyK3CmU5BWaQEbwUCh8?= =?us-ascii?q?QSkl5oK+++Imq/EsTXaTcnFt9JTl5v8iLzG0FUHMHjew+a+SXqvnYsExnyfTB4?= =?us-ascii?q?Ov7yUtaLyZ/nhqbvq9aKOloArQH+SI0xBS3+lR/WuMgSjNkqAYcK4TyNnEF1ff?= =?us-ascii?q?9Lz3hjP1OZkkW0zM6x+Jl+73YY4Kp5pIYTGZn9Kr81Sb1eESQOL3E+5MqtswLK?= =?us-ascii?q?CwSI+CgySGITxz5BHhLI6g2ydJb+tS3kt+551WHON8z5SrYcVTmo7q5tDhjyh3?= =?us-ascii?q?FUZHYC7GjLh5ko3+pgqxW7qkknzg=3D=3D?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A0GfDQC61U9X/2OteVteKgGCYyxWNkelc?= =?us-ascii?q?gUBAQEBAQEGgmgWAY8ehCgIgXOFOkwBAQEBAQECAmIngjB+W4EDAQE4L200iDA?= =?us-ascii?q?DAa8lhSgBAQWNAgiFX4ohhHIcmDyGAIJ4hSgCgjWMYwKCVox0AmKBQoItbIp8A?= =?us-ascii?q?QEB?= X-IPAS-Result: =?us-ascii?q?A0GfDQC61U9X/2OteVteKgGCYyxWNkelcgUBAQEBAQEGgmg?= =?us-ascii?q?WAY8ehCgIgXOFOkwBAQEBAQECAmIngjB+W4EDAQE4L200iDADAa8lhSgBAQWNA?= =?us-ascii?q?giFX4ohhHIcmDyGAIJ4hSgCgjWMYwKCVox0AmKBQoItbIp8AQEB?= X-IronPort-AV: E=Sophos;i="5.26,405,1459814400"; d="scan'208";a="14245776" Received: from anor.bigon.be ([91.121.173.99]) by emsm-gh1-uea10.nsa.gov with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Jun 2016 06:49:22 +0000 Received: from anor.bigon.be (localhost.localdomain [127.0.0.1]) by anor.bigon.be (Postfix) with ESMTP id C55561A1BB for ; Thu, 2 Jun 2016 08:49:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=bigon.be; h= x-mailer:message-id:date:date:subject:subject:from:from:received :received:received; s=key1; t=1464850158; x=1466664559; bh=JkMpp 6T/3Y5jwa2Apyw4bO4wnQN3PFQ9haCFdHrWMc4=; b=GsPkC7YQA7khzcv0IiuTh a08rT5uU9q5sOlpPcn4kq3I91zTyY3MAv3Xv8eBtqRbbQpuKwbToQEBRDdFI3zYO 3A9ARAcPeY+42GrS/aKmaWvX7jROCDSZifnpP28XfTRwkt0DC2e1R9cKm0dvJVRa k73MtHp6b6u1ctA9xBsAeo= X-Virus-Scanned: Debian amavisd-new at bigon.be Received: from anor.bigon.be ([127.0.0.1]) by anor.bigon.be (anor.bigon.be [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id e7kGqPwKlXZP for ; Thu, 2 Jun 2016 08:49:18 +0200 (CEST) Received: from fornost.bigon.be (unknown [IPv6:2a02:578:85fc:0:2440:d764:9b75:61a9]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) (Authenticated sender: bigon) by anor.bigon.be (Postfix) with ESMTPSA id 9B7F61A0D9 for ; Thu, 2 Jun 2016 08:49:18 +0200 (CEST) Received: from bigon (uid 1000) (envelope-from bigon@bigon.be) id 3faf7 by fornost.bigon.be (DragonFly Mail Agent v0.11); Thu, 02 Jun 2016 08:49:18 +0200 From: Laurent Bigonville To: selinux@tycho.nsa.gov Subject: [PATCH] Sort object files for deterministic linking order Date: Thu, 2 Jun 2016 08:49:18 +0200 Message-Id: <1464850158-16461-1-git-send-email-bigon@debian.org> X-Mailer: git-send-email 2.8.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: Laurent Bigonville This patch is part of the Debian effort to make the build reproducible Thank to Reiner Herrmann for the patches Signed-off-by: Laurent Bigonville --- libselinux/src/Makefile | 2 +- libsemanage/src/Makefile | 2 +- libsepol/src/Makefile | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile index ac9a5d6..d94163e 100644 --- a/libselinux/src/Makefile +++ b/libselinux/src/Makefile @@ -49,7 +49,7 @@ ifeq ($(DISABLE_BOOL),y) endif GENERATED=$(SWIGCOUT) $(SWIGRUBYCOUT) selinuxswig_python_exception.i -SRCS= $(filter-out $(UNUSED_SRCS) $(GENERATED) audit2why.c, $(wildcard *.c)) +SRCS= $(filter-out $(UNUSED_SRCS) $(GENERATED) audit2why.c, $(sort $(wildcard *.c))) MAX_STACK_SIZE=32768 diff --git a/libsemanage/src/Makefile b/libsemanage/src/Makefile index d6c3f0f..96ee652 100644 --- a/libsemanage/src/Makefile +++ b/libsemanage/src/Makefile @@ -52,7 +52,7 @@ SWIGRUBYSO=$(RUBYPREFIX)_semanage.so LIBSO=$(TARGET).$(LIBVERSION) GENERATED=$(SWIGCOUT) $(SWIGRUBYCOUT) semanageswig_python_exception.i -SRCS= $(filter-out $(GENERATED),$(wildcard *.c)) +SRCS= $(filter-out $(GENERATED),$(sort $(wildcard *.c))) OBJS= $(patsubst %.c,%.o,$(SRCS)) conf-scan.o conf-parse.o LOBJS= $(patsubst %.c,%.lo,$(SRCS)) conf-scan.lo conf-parse.lo diff --git a/libsepol/src/Makefile b/libsepol/src/Makefile index c0c3274..b0c901f 100644 --- a/libsepol/src/Makefile +++ b/libsepol/src/Makefile @@ -18,15 +18,15 @@ TARGET=libsepol.so LIBPC=libsepol.pc LIBMAP=libsepol.map LIBSO=$(TARGET).$(LIBVERSION) -OBJS= $(patsubst %.c,%.o,$(wildcard *.c)) -LOBJS= $(patsubst %.c,%.lo,$(wildcard *.c)) +OBJS= $(patsubst %.c,%.o,$(sort $(wildcard *.c))) +LOBJS= $(patsubst %.c,%.lo,$(sort $(wildcard *.c))) CFLAGS ?= -Werror -Wall -W -Wundef -Wshadow -Wmissing-format-attribute -O2 override CFLAGS += -I. -I../include -D_GNU_SOURCE ifneq ($(DISABLE_CIL),y) -OBJS += $(sort $(patsubst %.c,%.o,$(wildcard $(CILDIR)/src/*.c) $(CIL_GENERATED))) -LOBJS += $(sort $(patsubst %.c,%.lo,$(wildcard $(CILDIR)/src/*.c) $(CIL_GENERATED))) +OBJS += $(sort $(patsubst %.c,%.o,$(sort $(wildcard $(CILDIR)/src/*.c)) $(CIL_GENERATED))) +LOBJS += $(sort $(patsubst %.c,%.lo,$(sort $(wildcard $(CILDIR)/src/*.c)) $(CIL_GENERATED))) override CFLAGS += -I$(CILDIR)/include endif