From patchwork Tue Jan 9 18:25:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 1884585 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=JhMyNizr; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4T8fWC0hxGz1yP3 for ; Wed, 10 Jan 2024 05:25:41 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 84066385828C for ; Tue, 9 Jan 2024 18:25:38 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by sourceware.org (Postfix) with ESMTPS id C835E3858C66 for ; Tue, 9 Jan 2024 18:25:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C835E3858C66 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org C835E3858C66 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::433 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704824725; cv=none; b=EZOHLZ2pSv/mUADz4EMmMBmGCy9j08rxq5tC8Pd8fG/AE+4H6XPgEIfJg9D1/bl1Z9S9ObAVs7mzPFady68pPO8KiqLM52/jMZw1rdSOCIA+ekq19mD+eWfK8bFV8A0CUToXeruKVUqDy1qfXn19AFfyaSXhkgohpwBsgt7EgZE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704824725; c=relaxed/simple; bh=YrYe4kto1w4fKWVImk4AoH5rDQ0m+YgCSsRs/46cW3A=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=xDXuMDtGxHX/GbuZ1qLwolJYWwwBKy0sP+Qcs9rPa+5p16eyFLZGn5HTgHGDCZBv3FDYBx3KzcgIKEyQuZud0sHVZrgY1DNN5Dq17vYy+rMvuP6cAI7mOfLaKQEW6o+m7yf4AQLcZ0WTZ1dXrqwwJpS0fqnRgAzF+6Xz7dNRQSc= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-6d9bd63ec7fso1647410b3a.2 for ; Tue, 09 Jan 2024 10:25:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704824722; x=1705429522; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=wb66Vp0iGJQDUH0/c1LTPZEC6hB7+O3ecjilWVFLntA=; b=JhMyNizrONc08Z4Lv/aa9XLBxA2iSccgAyAEzAVP0HB7eg5omcRHaFBqmuP3lOe9Zv +X1RC06Diirab1bTiRLoEFwUbswFTeCtc988wOvXGjwQLNqoOauqLzmJRlbp3jO2wpWP BsdU2XYrsmMVcgillLQmTA224e3fIFJc9GSI2RhKOQZlJ6XxGgGQpFMfbAkhbnKtYDrm vel562rTFPXiRBX0I/DOfQVLJ+MeEWh0arqezWKe3hh2oh8LwyzdzRSdeAzzSBa/uCT5 H3x9fzRdy6qqwAQZlEjcVDKG8bqyMlTP4JPMENSMN7+8z+GqIv4CkEmn7ptWY5F4AXTq wHqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704824722; x=1705429522; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=wb66Vp0iGJQDUH0/c1LTPZEC6hB7+O3ecjilWVFLntA=; b=D6vK2OKW83cQj+eSBxrMmhy1NPqiX6IjfmAppdGDdY499pHffuQvTkJIZnW6uMPJUc 72YkiDVPIZMB+nnzoV8Cyh6LAzlD7VgCusLr7XdJS1//rTN6x3Igtyr+yAF9/mBleF1S bJmkKD2tKVhVA4aZZSMBHTfCcPcOm4Q5fnw069McF8Dyh4W8yABi8STRfVgBhyBOKK0W HFWoSlkJU9KqAUJcoRKTZyrlP3C8qZN4jIHJpQiGsq6gl2xgaOE3LVRRIl5x3A1fw8I/ 32ZdaBkfmP/x6Jop4dBt2Z3MzX4pEqR6JOdM0W/bngCLvAZxmqnx1EhB6mLSHzstn3mH Pw7w== X-Gm-Message-State: AOJu0YwK3F8kQkh0mAHIXbPIFiGVrZ0a3PLU7fRHTb+dDcNGQNGyVeif sO4KLp90ZsY40T7xPYXrUSc= X-Google-Smtp-Source: AGHT+IHzK6SbhAq1FfJ69iMP1/hyc06E/jmuPnzZRej1Y5LMKCtzp6X9HN/GRXYqTil8IBALkC/Ebg== X-Received: by 2002:a05:6a20:5283:b0:199:aa7f:7fc8 with SMTP id o3-20020a056a20528300b00199aa7f7fc8mr2066873pzg.64.1704824721707; Tue, 09 Jan 2024 10:25:21 -0800 (PST) Received: from gnu-cfl-3.localdomain ([172.56.169.119]) by smtp.gmail.com with ESMTPSA id fn11-20020a056a002fcb00b006d9a6a9992dsm1957670pfb.123.2024.01.09.10.25.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 10:25:21 -0800 (PST) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id 6BD2B740178; Tue, 9 Jan 2024 10:25:20 -0800 (PST) From: "H.J. Lu" To: libc-alpha@sourceware.org Cc: adhemerval.zanella@linaro.org Subject: [PATCH] Remove installed header rule on $(..)include/%.h Date: Tue, 9 Jan 2024 10:25:20 -0800 Message-ID: <20240109182520.2166103-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-3024.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org On x86-64 machine with [hjl@gnu-cfl-3 x86-glibc]$ ls -l /usr/include/asm/prctl.h sysdeps/unix/sysv/linux/x86_64/include/asm/prctl.h -rw-r--r-- 1 hjl hjl 825 Jan 9 09:41 sysdeps/unix/sysv/linux/x86_64/include/asm/prctl.h -rw-r--r-- 1 root root 1170 Nov 27 16:00 /usr/include/asm/prctl.h [hjl@gnu-cfl-3 x86-glibc]$ glibc configured with --enable-cet build failed: make[2]: Entering directory '/export/gnu/import/git/gitlab/x86-glibc/iconv' ../Makerules:327: update target '/export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/gnu/lib-names-64.h' due to: /export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/gnu/lib-names-64.stmp : ../Makeconfig:1216: update target '/export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/libc-modules.h' due to: /export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/libc-modules.stmp : ../Makerules:1126: update target '/usr/include/asm/prctl.h' due to: ../sysdeps/unix/sysv/linux/x86_64/64/../include/asm/prctl.h force-install /usr/bin/install -c -m 644 ../sysdeps/unix/sysv/linux/x86_64/64/../include/asm/prctl.h /usr/include/asm/prctl.h /usr/bin/install: cannot remove '/usr/include/asm/prctl.h': Permission denied make[2]: *** [../Makerules:1126: /usr/include/asm/prctl.h] Error 1 make[2]: Leaving directory '/export/gnu/import/git/gitlab/x86-glibc/iconv' make[1]: *** [Makefile:484: iconv/subdir_lib] Error 2 make[1]: Leaving directory '/export/gnu/import/git/gitlab/x86-glibc' make: *** [Makefile:9: all] Error 2 This is triggered by the rule in Makerules: $(inst_includedir)/%.h: $(..)include/%.h $(+force) $(do-install) Since no files under include/ should be installed, remove it from Makerules. Tested it on x86-64. There are no differences in the installed header files. --- Makerules | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makerules b/Makerules index a000bf7b5e..00365bc58b 100644 --- a/Makerules +++ b/Makerules @@ -1122,8 +1122,6 @@ $(inst_includedir)/%.h: $(common-objpfx)%.h $(+force) $(do-install) $(inst_includedir)/%.h: %.h $(+force) $(do-install) -$(inst_includedir)/%.h: $(..)include/%.h $(+force) - $(do-install) headers-nonh := $(filter-out %.h,$(headers)) ifdef headers-nonh $(addprefix $(inst_includedir)/,$(headers-nonh)): $(inst_includedir)/%: \