From patchwork Fri Sep 11 21:21:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 517024 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DA3C140772 for ; Sat, 12 Sep 2015 07:21:51 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=X4xGfdmN; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:content-type :content-transfer-encoding:from:to:subject:message-id:date; q= dns; s=default; b=JSeFQLX3R8TJVmQq3cwrW+zcuuSFmAacoXHUdqz+omNUIE c5fQiVEEsl7NgxtZ+ZYoRGPUa1Lwb81st1f6rjsVLDGO9CxqyKtpKBWFkiaWTFUg 9e2WnLWVamjgmjE0XZB3UXTpGfryqIclvDCz3mSzcXQJR8l3szjLjYr2EvDhk= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:content-type :content-transfer-encoding:from:to:subject:message-id:date; s= default; bh=eNww7GUL6vXRFl/Dkz5EujeMYPs=; b=X4xGfdmNr9t4OUxCm3au cZf7f/VJpv46pNQp988rdguBApGyJnfQajllYe5EAmla9L2DtbH+QzQMtPaPbq0c g0XQfcitTPpX0tZXuu0CJNrhHz4pemGLjvVmApuFchcsIa1WQOJU1wpYKCi+1cUG hCZQR08q/ShC9j19h5uktms= Received: (qmail 103920 invoked by alias); 11 Sep 2015 21:21:45 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 103907 invoked by uid 89); 11 Sep 2015 21:21:45 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_LOW autolearn=no version=3.3.2 X-HELO: topped-with-meat.com MIME-Version: 1.0 From: Roland McGrath To: "GNU C. Library" Subject: [COMMITTED PATCH] NaCl: Do not install . Message-Id: <20150911212142.B437B2C39F1@topped-with-meat.com> Date: Fri, 11 Sep 2015 14:21:42 -0700 (PDT) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.1 cv=SvUDtp+0 c=1 sm=1 tr=0 a=WkljmVdYkabdwxfqvArNOQ==:117 a=14OXPxybAAAA:8 a=hOe2yjtxAAAA:8 a=kj9zAlcOel0A:10 a=DuVf4IQTmFuTgHa9tm8A:9 a=CjuIK1q_8ugA:10 I'm putting this on both trunk and 2.22 branch. It is a user-visible change and I didn't bother filing in bugzilla, because no NaCl application developer will actually see the 2.22-release version before this change. Thanks, Roland 2015-09-11 Roland McGrath * sysdeps/nacl/Makefile [$(subdir) = misc] (sysdep_headers): Use 'override' keyword to freeze the value here, preventing the addition of sys/mtio.h by sysdeps/gnu/Makefile. diff --git a/sysdeps/nacl/Makefile b/sysdeps/nacl/Makefile index 6749a44..1748886 100644 --- a/sysdeps/nacl/Makefile +++ b/sysdeps/nacl/Makefile @@ -132,4 +132,13 @@ ifeq ($(subdir),misc) # sysdeps/.../linux/ directories, but it's still a sysdeps decision to # install it. sysdep_headers += bits/mman-linux.h + +# This defeats sysdeps/gnu/Makefile's addition of sys/mtio.h, which +# we do not want. This is a total kludge, but it seems no worse for +# now than making the sysdeps/gnu/Makefile code conditional on a +# variable we set here. If some sysdeps/.../Makefile that is later +# in the list than sysdeps/gnu needed to add to sysdep_headers, this +# would break it. But sysdeps/gnu is close to last in the list and +# this coming up seems unlikely. +override sysdep_headers := $(sysdep_headers) endif