From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id INzPHyU0vmYcegEA62LTzQ:P1 (envelope-from ) for ; Thu, 15 Aug 2024 17:00:21 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id INzPHyU0vmYcegEA62LTzQ (envelope-from ) for ; Thu, 15 Aug 2024 19:00:21 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=tGW2iJbM; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=YTthOs6O; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1723741221; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=WNQTG/Bqr3h/iYOdMlS45H8OzAeWlMdDAEVxa0Xcbcg=; b=OoqarlKe7tu0dCPm4MxBrZZkOGJr/KkcDaB8VM0nvyGuoxqM54UTB1guVZBgeiW1hk5G04 pQaCc4s+wkSjpAn+Ahh0uoMPJv4mKZ9UrTiY664zBpPZ1XJUuisWGdB1aKt/BQrrER4u+0 g8KIgILacHy8AedosT0dcI8D69qUtxQj5knn9Ig7cNm1lsyYOXlfDRMKcICrHfd+i7OMr5 mrA6dW7v9cByp4LUkeFlw61VZkqCdXdEWfphI++kESeXYwdjgzB7MU69G/MReMmYvMDHfc XA2TpjjDmy7HcJw+Z+hKjYW63Ju+5X2E1Wo0LF4uMgoW8qhTbuV1T4mikH506Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1723741221; a=rsa-sha256; cv=none; b=Xn453WE8U/Myhpj0OgNZQa7AUioyTMaJmWzqhnLsFlo1QhsB5OnMAwrAPt9u/nk4V3HFd0 NK0YnyWKNLlUgZ3+1bBwihgCwOwmJNb6TKU3RG4QQ+DbaSQwhrmH7bQLix3rU5WzKM3wlz yTflOJTZMiYFHESLNPDsmuL0arI40++Bpcv8XhvQ0wTVCqLc0rZjbsa4JFi9lOlu0WBnjx sntRZ9OtDG9iszZhFnZC7Is1MPlbGq0KXhYw5pME1jcgAVdgrLFMPWAL4VKla93NMEwM6o M6cNXFRL8VpGVvp7QWllGZ8hAbgYc5SBw83AO75JWglZr5bDQEgi47iWvhZYLQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=tGW2iJbM; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=YTthOs6O; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 61C2278A21 for ; Thu, 15 Aug 2024 19:00:21 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sedpE-00028s-DM; Thu, 15 Aug 2024 12:59:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sedp0-00024W-5l for guix-patches@gnu.org; Thu, 15 Aug 2024 12:59:36 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sedos-0003Sf-ON for guix-patches@gnu.org; Thu, 15 Aug 2024 12:59:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=WNQTG/Bqr3h/iYOdMlS45H8OzAeWlMdDAEVxa0Xcbcg=; b=tGW2iJbM8WwnAUsHNslPz6sGetvT+tSMX9bmsZ9hr0Nf/Wi27n8fBWaCtisJz5KO13png5rTCmW77cPSHB8YaVltuEVh8U4wATp0H+8S5OZfs8i11AwEOp6CK0J5ajcldz6xidMQb4sEWBkZc6cu8H2pHtrdhIRWE2HSdXG8Mf95cqxa2hts93S9uzO+Y9RLYEepfqTm7JShJ1Ew5ANBu+zahPYrEH4yBxz1DmMMqAwKmVSQC5iosfaChYKyBBoERe7ylmiohcHsJmqEkBI1zanYbEEp/tuQgXV11vS3ZMoOeJ47yQWxWnHG03/eGeI3ImsDZllAPhU/3papx3pCqA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sedpT-0003SI-3x for guix-patches@gnu.org; Thu, 15 Aug 2024 13:00:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72643] [PATCH core-updates 2/6] gnu: make-bootstrap: Adjust =?UTF-8?Q?=E2=80=98%glibc-stripped=E2=80=99?= for glibc@2.39 on the Hurd. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 15 Aug 2024 17:00:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72643 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72643@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 72643-submit@debbugs.gnu.org id=B72643.172374117413169 (code B ref 72643); Thu, 15 Aug 2024 17:00:03 +0000 Received: (at 72643) by debbugs.gnu.org; 15 Aug 2024 16:59:34 +0000 Received: from localhost ([127.0.0.1]:49664 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sedoz-0003QK-7i for submit@debbugs.gnu.org; Thu, 15 Aug 2024 12:59:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sedou-0003Pe-Rp for 72643@debbugs.gnu.org; Thu, 15 Aug 2024 12:59:29 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sedoF-0003Qk-52; Thu, 15 Aug 2024 12:58:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=WNQTG/Bqr3h/iYOdMlS45H8OzAeWlMdDAEVxa0Xcbcg=; b=YTthOs6OXtM89EYmQaxU CCR4lnuc+xrp1vd0yFAW65lHvd8+yq8lXTmJ+gUqv+TO0Rub4dVvJHMfGc/ZHTZq+Du59EyEGnjDK gfNSG1ykZb5pyK3U++3c9XWuRDyOaxFdHtGQou3HEWn2wm8r1c8EOV1jZbHzbznwhajdfHLsmgTcT Eg2noT+tvMt9Quk5xMHny6XZU0YH6DHAHdrKInYf9xiDqG6WR57vBwTEtR5TW0Leadh6cmSfF78CC WaGhzVBmeKuusWwZ7/DRncU4iGxp/P9QRNgGJA5lCvkjndmVMEn53wzgHYu+U35/KZ/0DHN4YcFpg FUFG5dJgyegrOA==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Thu, 15 Aug 2024 18:58:30 +0200 Message-ID: <6e5e8f74944fc359de973b7ef29e537cbfd1685d.1723740352.git.ludo@gnu.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.06 X-Spam-Score: -5.06 X-Migadu-Queue-Id: 61C2278A21 X-Migadu-Scanner: mx11.migadu.com X-TUID: mgc+Q2Gh0Ykv Previously the second ‘copy-recursively’ call would fail with EEXIST since glibc@2.39 already provides $includedir/include/mach. * guix/build/make-bootstrap.scm (make-stripped-libc)[copy-mach-headers]: Pass #:select? to ‘copy-recursively’ to exclude files already present under INCDIR. Change-Id: I7e5a93e46eefa18299c231468c720072468fdb10 --- guix/build/make-bootstrap.scm | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/guix/build/make-bootstrap.scm b/guix/build/make-bootstrap.scm index 0d29338ce3..6cb5262f8e 100644 --- a/guix/build/make-bootstrap.scm +++ b/guix/build/make-bootstrap.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2017 Manolis Fragkiskos Ragkousis -;;; Copyright © 2015, 2019 Ludovic Courtès +;;; Copyright © 2015, 2019, 2024 Ludovic Courtès ;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. @@ -84,13 +84,27 @@ (define (make-stripped-libc output libc kernel-headers) when producing a bootstrap libc." (define (copy-mach-headers output kernel-headers) - (let* ((incdir (string-append output "/include"))) + (let ((mach-headers (readlink + (string-append kernel-headers "/include/mach"))) + (incdir (string-append output "/include"))) (copy-recursively (string-append libc "/include") incdir) - (copy-recursively (string-append kernel-headers "/include/mach") - (string-append incdir "/mach")) - #t)) - + ;; As of glibc 2.39, essential Mach headers get installed by glibc + ;; itself in its own includedir, except for most of mach/machine/*.h. + ;; Copy anything that's missing from MACH-HEADERS. + (copy-recursively mach-headers + (string-append incdir "/mach") + #:select? + (let ((prefix (string-length mach-headers)) + (target (string-append incdir "/mach"))) + (lambda (file stat) + ;; Select everything but files and symlinks that + ;; already exist under TARGET. + (or (eq? 'directory (stat:type stat)) + (let ((suffix (string-drop file prefix))) + (not (file-exists? + (in-vicinity target suffix)))))))))) + (define (copy-libc+linux-headers output kernel-headers) (let* ((incdir (string-append output "/include"))) (copy-recursively (string-append libc "/include") incdir) -- 2.45.2