From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1039) id 502AD3858283; Tue, 9 Jan 2024 18:36:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 502AD3858283 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1704825388; bh=Pfq+bHJQdIGcpWUhJ79xJkjR2nrxwiBG7Y8yU7sjAmQ=; h=From:To:Subject:Date:From; b=HBFTzgwIr3aa3o+hi8vQjKpULhve3Mm+lzPzCFk8vdvU2oThHZw3zUw7+ZOXltLz5 dvL08I1rv1M8qscl42ggO280r/NuwWoKx1Q/Plhiyl7mZ4+jHyBTQ5ED+ykmX4oKxn 4WtPeZXp0cMOcypbGQp/lovNYJSeJ8h54fJihq1w= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: H.J. Lu To: glibc-cvs@sourceware.org Subject: [glibc] Remove installed header rule on $(..)include/%.h X-Act-Checkin: glibc X-Git-Author: H.J. Lu X-Git-Refname: refs/heads/master X-Git-Oldrev: a0cfc48e8a67506e3f0b2d3ea5e04b45408b3683 X-Git-Newrev: 1eae989cb7632760fd6f4008be73549da861b202 Message-Id: <20240109183628.502AD3858283@sourceware.org> Date: Tue, 9 Jan 2024 18:36:28 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=1eae989cb7632760fd6f4008be73549da861b202 commit 1eae989cb7632760fd6f4008be73549da861b202 Author: H.J. Lu Date: Tue Jan 9 10:25:20 2024 -0800 Remove installed header rule on $(..)include/%.h 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. Diff: --- 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)/%: \