From patchwork Thu Sep 1 22:29:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 42130 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9A5CF27BBEA; Thu, 1 Sep 2022 23:31:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E45F027BBE9 for ; Thu, 1 Sep 2022 23:31:14 +0100 (BST) Received: from localhost ([::1]:50498 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oTsiQ-0005VA-1L for patchwork@mira.cbaines.net; Thu, 01 Sep 2022 18:31:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oTsiE-0005UN-HU for guix-patches@gnu.org; Thu, 01 Sep 2022 18:31:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54597) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oTsiE-0005ZG-9J for guix-patches@gnu.org; Thu, 01 Sep 2022 18:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oTsiE-00035s-1o for guix-patches@gnu.org; Thu, 01 Sep 2022 18:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57533] [PATCH core-updates 1/5] gnu: glibc: Update to 2.35. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Sep 2022 22:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57533 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57533@debbugs.gnu.org Cc: zamfofex Received: via spool by 57533-submit@debbugs.gnu.org id=B57533.166207141011759 (code B ref 57533); Thu, 01 Sep 2022 22:31:02 +0000 Received: (at 57533) by debbugs.gnu.org; 1 Sep 2022 22:30:10 +0000 Received: from localhost ([127.0.0.1]:44329 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oTshN-00033Z-N8 for submit@debbugs.gnu.org; Thu, 01 Sep 2022 18:30:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40862) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oTshM-00032I-1S for 57533@debbugs.gnu.org; Thu, 01 Sep 2022 18:30:08 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:45304) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oTshG-00058h-JI; Thu, 01 Sep 2022 18:30:02 -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=4LJZ2BWZGmzOPt/uI9ngVQkEISK8bbzGHgxib9UIvKI=; b=YMUXuU/SPrrsO7f84Xva 0dAP2V15qCbKdJ4s84c9rfUdadAkcKnyP3jwB74vJmBoKSPOj5uhAdSVRswdW+5j0VQFjybheNW+4 DIuHfOc5ad1YnidZJ2nlWKOu8shebZ7xFL00syaeWt3WknM8+w/vIA4byFXz+i0f3t3vFgb57OF9i A+lLiklS07V0O87bT9s/BpzUNVPiY4TOtxNpn01tLnfZfeQLp5P/PMFRzEjEpooafAhuCbjCYAqWS yTGxENVKBQv9CUQElirfdNyqQWD6NavxeNYQPovywEKQiIXkc9LBMV8FGkQTmfRlfR4N/Efgdij+g 5wEj6OQSyJJpkA==; Received: from [84.214.173.6] (port=40078 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oTshF-0001Su-IX; Thu, 01 Sep 2022 18:30:02 -0400 From: Marius Bakke Date: Fri, 2 Sep 2022 00:29:53 +0200 Message-Id: <20220901222957.15383-1-marius@gnu.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220901222413.14482-1-marius@gnu.org> References: <20220901222413.14482-1-marius@gnu.org> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: zamfofex * gnu/packages/base.scm (glibc): Update to 2.35. [arguments]: Handle empty library files. * gnu/packages/patches/glibc-hurd-clock_gettime_monotonic.patch: Adjust for renamed file. Signed-off-by: Marius Bakke --- gnu/packages/base.scm | 34 +++++++++++++++++-- .../glibc-hurd-clock_gettime_monotonic.patch | 4 +-- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index cf640aad25..157cba5ff4 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2022 zamfofex ;;; ;;; This file is part of GNU Guix. ;;; @@ -709,13 +710,13 @@ (define-public glibc ;; version 2.28, GNU/Hurd used a different glibc branch. (package (name "glibc") - (version "2.33") + (version "2.35") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) (sha256 (base32 - "1zvp0qdfbdyqrzydz18d9zg3n5ygy8ps7cmny1bvsp8h1q05c99f")) + "0bpm1kfi09dxl4c6aanc5c9951fmf6ckkzay60cx7k37dcpp68si")) (patches (search-patches "glibc-ldd-powerpc.patch" "glibc-ldd-x86_64.patch" "glibc-dl-cache.patch" @@ -753,6 +754,7 @@ (define-public glibc #:validate-runpath? #f #:modules ((ice-9 ftw) + (srfi srfi-1) (srfi srfi-26) (guix build utils) (guix build gnu-build-system)) @@ -867,13 +869,34 @@ (define-public glibc (add-after 'install 'move-static-libs (lambda* (#:key outputs #:allow-other-keys) ;; Move static libraries to the "static" output. + ;; Note: As of GNU libc 2.34, the contents of some ".a" + ;; files have been moved into "libc.so", and *both* empty + ;; ".so" and ".a" files have been introduced to avoid + ;; breaking existing executables and existing builds + ;; respectively. The intent of the seemingly redundant + ;; empty ".a" files is to avoid newly-compiled executables + ;; from having dependencies on the empty shared libraries, + ;; and as such, it is useful to have these ".a" files in + ;; OUT in addition to STATIC. + + ;; XXX: It might be better to determine whether a static + ;; library is empty by some criterion (such as their file + ;; size equaling eight bytes) rather than hardcoding them + ;; by name. + (define empty-static-libraries + '("libpthread.a" "libdl.a" "libutil.a" "libanl.a")) + (define (empty-static-library? file) + (any (lambda (s) + (string=? file s)) empty-static-libraries)) + (define (static-library? file) ;; Return true if FILE is a static library. The ;; "_nonshared.a" files are referred to by libc.so, ;; libpthread.so, etc., which are in fact linker ;; scripts. (and (string-suffix? ".a" file) - (not (string-contains file "_nonshared")))) + (not (string-contains file "_nonshared")) + (not (empty-static-library? file)))) (define (linker-script? file) ;; Guess whether FILE, a ".a" file, is actually a @@ -884,6 +907,7 @@ (define (linker-script? file) (let* ((out (assoc-ref outputs "out")) (lib (string-append out "/lib")) (files (scandir lib static-library?)) + (empty (scandir lib empty-static-library?)) (static (assoc-ref outputs "static")) (slib (string-append static "/lib"))) (mkdir-p slib) @@ -891,6 +915,10 @@ (define (linker-script? file) (rename-file (string-append lib "/" base) (string-append slib "/" base))) files) + (for-each (lambda (base) + (copy-file (string-append lib "/" base) + (string-append slib "/" base))) + empty) ;; Usually libm.a is a linker script so we need to ;; change the file names in there to refer to STATIC diff --git a/gnu/packages/patches/glibc-hurd-clock_gettime_monotonic.patch b/gnu/packages/patches/glibc-hurd-clock_gettime_monotonic.patch index e31f99a1ce..b02215550d 100644 --- a/gnu/packages/patches/glibc-hurd-clock_gettime_monotonic.patch +++ b/gnu/packages/patches/glibc-hurd-clock_gettime_monotonic.patch @@ -67,8 +67,8 @@ index fcd79fd554..1dd02aa449 100644 diff --git a/sysdeps/pthread/timer_create.c b/sysdeps/pthread/timer_create.c index 9d8a9ea8ae..3430582c09 100644 ---- a/sysdeps/pthread/timer_create.c -+++ b/sysdeps/pthread/timer_create.c +--- a/rt/timer_create.c ++++ b/rt/timer_create.c @@ -48,7 +48,7 @@ timer_create (clockid_t clock_id, struct sigevent *evp, timer_t *timerid) return -1; } From patchwork Thu Sep 1 22:29:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 42132 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5439127BBEC; Thu, 1 Sep 2022 23:31:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 709CA27BBEA for ; Thu, 1 Sep 2022 23:31:16 +0100 (BST) Received: from localhost ([::1]:50502 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oTsiR-0005WL-FW for patchwork@mira.cbaines.net; Thu, 01 Sep 2022 18:31:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57992) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oTsiE-0005UW-W5 for guix-patches@gnu.org; Thu, 01 Sep 2022 18:31:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54598) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oTsiE-0005ZS-Ns for guix-patches@gnu.org; Thu, 01 Sep 2022 18:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oTsiE-00035z-J5 for guix-patches@gnu.org; Thu, 01 Sep 2022 18:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57533] [PATCH core-updates 2/5] syscalls: Adjust for glibc 2.34 and later. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Sep 2022 22:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57533 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57533@debbugs.gnu.org Received: via spool by 57533-submit@debbugs.gnu.org id=B57533.166207143811826 (code B ref 57533); Thu, 01 Sep 2022 22:31:02 +0000 Received: (at 57533) by debbugs.gnu.org; 1 Sep 2022 22:30:38 +0000 Received: from localhost ([127.0.0.1]:44336 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oTshq-00034f-9l for submit@debbugs.gnu.org; Thu, 01 Sep 2022 18:30:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33772) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oTsho-00034R-Si for 57533@debbugs.gnu.org; Thu, 01 Sep 2022 18:30:37 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:41492) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oTshj-0005SL-2G for 57533@debbugs.gnu.org; Thu, 01 Sep 2022 18:30:31 -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=/ITJnvUbg6zOESHulka1L06BcDB35gGKcG6nWI04QWw=; b=cor8IjKPx18N+wzJnmJL haPiGVES095AT+Qgirm8a4q1J0rJXAiiOeKTrZJATEBtok3lYruCQuxyuz+aJS5TnU8497+fQCMuX tfd7G48zdkRA0OZ7HyKztkyCJFEeFxNFJBzgBdZzpEkIz6L5fyu7THXa0pBUxiMqYJzRoB5e2fqrc H1JKHlYrrHPnkPbiWjhx52MxGbJS3bRq/LB9+NBPvy36Syu4cOfQaZbCu1y8e5w49gCEIo+NRh4P7 NWzS/qvN5HTP/DgSm21QpHydPeV5keYIsnccefIpUHUNuU8ibjh+rz9IazG+P1Cjzy2padHiSBOpP Jx/vZp7fmT9DyA==; Received: from [84.214.173.6] (port=40082 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oTshI-0001c4-2b for 57533@debbugs.gnu.org; Thu, 01 Sep 2022 18:30:09 -0400 From: Marius Bakke Date: Fri, 2 Sep 2022 00:29:54 +0200 Message-Id: <20220901222957.15383-2-marius@gnu.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220901222957.15383-1-marius@gnu.org> References: <20220901222413.14482-1-marius@gnu.org> <20220901222957.15383-1-marius@gnu.org> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/build/syscalls.scm (openpty, login-tty): Remove #:library argument, as these functions have been moved to libc.so. --- guix/build/syscalls.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index eda487f52e..7c88ccdd5a 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -2319,8 +2319,7 @@ (define* (terminal-rows #:optional (port (current-output-port))) (terminal-dimension window-size-rows port (const 25))) (define openpty - (let ((proc (syscall->procedure int "openpty" '(* * * * *) - #:library "libutil"))) + (let ((proc (syscall->procedure int "openpty" '(* * * * *)))) (lambda () "Return two file descriptors: one for the pseudo-terminal control side, and one for the controlled side." @@ -2341,8 +2340,7 @@ (define openpty (values (* head) (* inferior))))))) (define login-tty - (let* ((proc (syscall->procedure int "login_tty" (list int) - #:library "libutil"))) + (let* ((proc (syscall->procedure int "login_tty" (list int)))) (lambda (fd) "Make FD the controlling terminal of the current process (with the TIOCSCTTY ioctl), redirect standard input, standard output and standard error From patchwork Thu Sep 1 22:29:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 42134 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A3EA327BBEA; Thu, 1 Sep 2022 23:31:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D864627BBE9 for ; Thu, 1 Sep 2022 23:31:28 +0100 (BST) Received: from localhost ([::1]:34632 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oTsie-00065r-1T for patchwork@mira.cbaines.net; Thu, 01 Sep 2022 18:31:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57994) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oTsiF-0005Ud-Bh for guix-patches@gnu.org; Thu, 01 Sep 2022 18:31:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54599) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oTsiF-0005ZY-3h for guix-patches@gnu.org; Thu, 01 Sep 2022 18:31:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oTsiF-000367-03 for guix-patches@gnu.org; Thu, 01 Sep 2022 18:31:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57533] [PATCH core-updates 3/5] gnu: Switch to GCC 11. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Sep 2022 22:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57533 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57533@debbugs.gnu.org Received: via spool by 57533-submit@debbugs.gnu.org id=B57533.166207144111849 (code B ref 57533); Thu, 01 Sep 2022 22:31:02 +0000 Received: (at 57533) by debbugs.gnu.org; 1 Sep 2022 22:30:41 +0000 Received: from localhost ([127.0.0.1]:44340 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oTshs-00034y-Jo for submit@debbugs.gnu.org; Thu, 01 Sep 2022 18:30:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33774) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oTshp-00034S-5C for 57533@debbugs.gnu.org; Thu, 01 Sep 2022 18:30:38 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:41496) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oTshj-0005Tn-VT for 57533@debbugs.gnu.org; Thu, 01 Sep 2022 18:30:31 -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=lHY2gsbAyZC7UvjpeUdR4CB2smvDWtGxPmCcYWUgeEU=; b=E82C2FnenlQR9Wuw5pOS x58Y1aV3XkhiJMfubtTxWkhYge7ZsXWN7yQmIovmhWgVd/6W6BIIa+HUlP64I6mGjIEPfZbgfOKBg SSNxJu3wxupEnCT38XYQXJzEQfVKp6+vKCqN/INLsRaGUMvhRwOJigXX4aF8Say9cbYDIP1cHmwfn vOkwm6QBI9Kqr8EWY1EATlPKLjKt1aJcSe1+H+QuWTeo8kcJdzIclRWFGfhh2dfrmPpikS6t/ytmz FeIPutnyKB+jq+UeZU3veZIYMf5yGe6+2wycp8ML9AS7Vt0nPqcD7OYn+deSu4QJFlzCNSRYiU7d0 3XhyGa+5JMG+kw==; Received: from [84.214.173.6] (port=40382 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oTshj-0001n2-8t for 57533@debbugs.gnu.org; Thu, 01 Sep 2022 18:30:31 -0400 From: Marius Bakke Date: Fri, 2 Sep 2022 00:29:55 +0200 Message-Id: <20220901222957.15383-3-marius@gnu.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220901222957.15383-1-marius@gnu.org> References: <20220901222413.14482-1-marius@gnu.org> <20220901222957.15383-1-marius@gnu.org> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/commencement.scm (gcc-boot0)[source]: Delete offending files from GCC. (libstdc++-boot0)[arguments]: Add #:modules. (libstdc++): Inherit from from GCC-BOOT0 rather than GCC. (gcc-final)[arguments]: Add phase to workaround libstdc++ build system issue. Add #:modules. * gnu/packages/gcc.scm (make-libstdc++): Likewise. --- gnu/packages/commencement.scm | 55 ++++++++++++++++++++++++++++++----- gnu/packages/gcc.scm | 33 ++++++++++++++++++--- 2 files changed, 77 insertions(+), 11 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 0dbd39382e..a27340c14d 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2213,7 +2213,13 @@ (define libstdc++-boot0 (lambda _ (substitute* "libstdc++-v3/configure" (("g\\+\\+ -v") "true")))))))) - (_ (package-arguments lib))))) + (_ (package-arguments lib))) + + ;; Explicitly add #:modules so MAKE-LIBSTDC++ can be changed + ;; without a full bootstrap. + #:modules ((guix build gnu-build-system) + (guix build utils)))) + (inputs (%boot0-inputs)) (native-inputs '())))) @@ -2266,7 +2272,18 @@ (define gcc-boot0 (inherit gcc) (name "gcc-cross-boot0") (outputs (delete "debug" (package-outputs gcc))) - (source (bootstrap-origin (package-source gcc))) + (source + (bootstrap-origin + (origin + (inherit (package-source gcc)) + (snippet + #~(begin + ;; XXX: The GCC test suite contains files with non-ASCII file + ;; names, which cannot be repacked by BOOTSTRAP-ORIGIN. Nor + ;; can it be deleted from Guile, so resort to this evil hack. + #$(origin-snippet (package-source gcc)) + (system* #$(file-append coreutils-boot0 "/bin/rm") "-rf" + "gcc/testsuite/go.test/test/fixedbugs/issue27836.dir")))))) (arguments `(#:guile ,%bootstrap-guile #:implicit-inputs? #f @@ -2991,7 +3008,7 @@ (define binutils-final (define libstdc++ ;; Intermediate libstdc++ that will allow us to build the final GCC ;; (remember that GCC-BOOT0 cannot build libstdc++.) - (let ((lib (make-libstdc++ gcc))) + (let ((lib (make-libstdc++ gcc-boot0))) (package (inherit lib) (source (bootstrap-origin (package-source lib))) @@ -3059,6 +3076,11 @@ (define gcc-final ;; positive, so turn it off. #:validate-runpath? #f + ;; Additional modules for the libstdc++ phase below. + #:modules ((srfi srfi-1) + (srfi srfi-26) + ,@%gnu-build-system-modules) + ,@(substitute-keyword-arguments (package-arguments gcc) ((#:make-flags flags) ;; Since $LIBRARY_PATH is not honored, add the relevant flags. @@ -3096,7 +3118,26 @@ (define gcc-final (package-full-name lib "-") char-set:letter) ,(package-name lib))) - (list gmp-6.0 mpfr mpc)))))))))) + (list gmp-6.0 mpfr mpc))))) + (add-after 'unpack 'fix-build-with-external-libstdc++ + (lambda* (#:key inputs #:allow-other-keys) + (let ((libstdc++ (assoc-ref inputs "libstdc++"))) + ;; Fix a regression in GCC 11 where the libstc++ input + ;; shadows glibc headers when building libstdc++. An + ;; upstream fix was added in GCC 11.3.0, but it only + ;; hides system include directories, not those on + ;; CPLUS_INCLUDE_PATH. See discussion at + ;; . + (substitute* "libstdc++-v3/src/c++17/Makefile.in" + (("AM_CXXFLAGS = ") + (string-append "CPLUS_INCLUDE_PATH = " + (string-join + (remove (cut string-prefix? libstdc++ <>) + (string-split + (getenv "CPLUS_INCLUDE_PATH") + #\:)) + ":") + "\nAM_CXXFLAGS = "))))))))))) ;; This time we want Texinfo, so we get the manual. Add ;; STATIC-BASH-FOR-GLIBC so that it's used in the final shebangs of @@ -3407,10 +3448,10 @@ (define-public gcc-toolchain-9 (make-gcc-toolchain gcc-9)) (define-public gcc-toolchain-10 - gcc-toolchain) + (make-gcc-toolchain gcc-10)) (define-public gcc-toolchain-11 - (make-gcc-toolchain gcc-11)) + gcc-toolchain) (define-public gcc-toolchain-12 (make-gcc-toolchain gcc-12)) @@ -3418,7 +3459,7 @@ (define-public gcc-toolchain-12 (define-public gcc-toolchain-aka-gcc ;; It's natural for users to try "guix install gcc". This package ;; automatically "redirects" them to 'gcc-toolchain'. - (deprecated-package "gcc" gcc-toolchain-10)) + (deprecated-package "gcc" gcc-toolchain-11)) (define-public gdc-toolchain-10 diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index b6854813d7..80eaec722a 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2020, 2021, 2022 Efraim Flashner ;;; Copyright © 2016 Carlos Sánchez de La Lama ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2018, 2020 Marius Bakke +;;; Copyright © 2018, 2020, 2022 Marius Bakke ;;; Copyright © 2020 Joseph LaFreniere ;;; Copyright © 2020 Guy Fleury Iteriteka ;;; Copyright © 2020 Simon Tournier @@ -718,7 +718,7 @@ (define-public gcc-12 ;; Note: When changing the default gcc version, update ;; the gcc-toolchain-* definitions. -(define-public gcc gcc-10) +(define-public gcc gcc-11) ;;; @@ -821,8 +821,33 @@ (define-public (make-libstdc++ gcc) (name "libstdc++") (arguments `(#:out-of-source? #t + #:modules ((srfi srfi-1) + (srfi srfi-26) + ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases + ,@(if (version>=? (package-version gcc) "11") + '((add-after 'unpack 'hide-gcc-headers + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (let ((gcc (assoc-ref (or native-inputs inputs) "gcc"))) + ;; Fix a regression in GCC 11 where the GCC headers + ;; shadows glibc headers when building libstdc++. An + ;; upstream fix was added in GCC 11.3.0, but it only + ;; hides system include directories, not those on + ;; CPLUS_INCLUDE_PATH. See discussion at + ;; + ;; and the similar adjustment in GCC-FINAL. + (substitute* "libstdc++-v3/src/c++17/Makefile.in" + (("AM_CXXFLAGS = ") + (string-append "CPLUS_INCLUDE_PATH = " + (string-join + (remove (cut string-prefix? gcc <>) + (string-split + (getenv "CPLUS_INCLUDE_PATH") + #\:)) + ":") + "\nAM_CXXFLAGS = "))))))) + '()) ;; Force rs6000 (i.e., powerpc) libdir to be /lib and not /lib64. (add-before 'chdir 'fix-rs6000-libdir (lambda _ @@ -1109,7 +1134,7 @@ (define-public gcc-objc-12 (custom-gcc gcc-12 "gcc-objc" '("objc") %objc-search-paths)) -(define-public gcc-objc gcc-objc-10) +(define-public gcc-objc gcc-objc-11) (define %objc++-search-paths (list (search-path-specification @@ -1159,7 +1184,7 @@ (define-public gcc-objc++-12 (custom-gcc gcc-12 "gcc-objc++" '("obj-c++") %objc++-search-paths)) -(define-public gcc-objc++ gcc-objc++-10) +(define-public gcc-objc++ gcc-objc++-11) (define (make-libstdc++-doc gcc) "Return a package with the libstdc++ documentation for GCC." From patchwork Thu Sep 1 22:29:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 42133 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 954EF27BBEA; Thu, 1 Sep 2022 23:31:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CB76E27BBE9 for ; Thu, 1 Sep 2022 23:31:16 +0100 (BST) Received: from localhost ([::1]:50504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oTsiR-0005XM-TK for patchwork@mira.cbaines.net; Thu, 01 Sep 2022 18:31:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57996) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oTsiF-0005Ue-Nq for guix-patches@gnu.org; Thu, 01 Sep 2022 18:31:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54600) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oTsiF-0005Ze-FH for guix-patches@gnu.org; Thu, 01 Sep 2022 18:31:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oTsiF-00036E-BY for guix-patches@gnu.org; Thu, 01 Sep 2022 18:31:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57533] [PATCH core-updates 4/5] gnu: glm: Fix build with GCC 11. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Sep 2022 22:31:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57533 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57533@debbugs.gnu.org Received: via spool by 57533-submit@debbugs.gnu.org id=B57533.166207144211859 (code B ref 57533); Thu, 01 Sep 2022 22:31:03 +0000 Received: (at 57533) by debbugs.gnu.org; 1 Sep 2022 22:30:42 +0000 Received: from localhost ([127.0.0.1]:44344 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oTshu-00035D-9F for submit@debbugs.gnu.org; Thu, 01 Sep 2022 18:30:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33776) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oTshr-00034V-0P for 57533@debbugs.gnu.org; Thu, 01 Sep 2022 18:30:39 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:41498) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oTshl-0005UG-QN for 57533@debbugs.gnu.org; Thu, 01 Sep 2022 18:30:33 -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=U2lCsyd86NJh4ObKZsEBNB1DKGmcshLlhg2/24gcXKo=; b=SauOGNtiindvZFNwyEkH AIe41NDCZZ6lqeOv2HoelkPI9qghZitsGr/blgMtaPiQBfEDVZlQsrWZlMsUFMCXxWEOXdwhzWzyH Ej6hk70F25CCam9fJ1YbftMbGGXy3KYbY7Zrp/Sf0Bg2KYGCCxr+3qKHtIUMpSCfCrfLX0NcCXx+w YNneNVURxydl1XciQRxK80ls/w8MXQLp11BlbAEfa9PrVlaJxj57abQIQ6AX3WS6ayx1LqmnLOcO5 0P2znXB/vHUDuv1k/3ijfFiM1v6zf+/WxBrz4QPJpf2LwKu9SpfTBZ/B3CSEl0NRE5NmH/isKg0Lw OWEb873RYk7NFQ==; Received: from [84.214.173.6] (port=40390 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oTshl-0001tO-3r for 57533@debbugs.gnu.org; Thu, 01 Sep 2022 18:30:33 -0400 From: Marius Bakke Date: Fri, 2 Sep 2022 00:29:56 +0200 Message-Id: <20220901222957.15383-4-marius@gnu.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220901222957.15383-1-marius@gnu.org> References: <20220901222413.14482-1-marius@gnu.org> <20220901222957.15383-1-marius@gnu.org> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (glm)[arguments]: Add phase set-environment. --- gnu/packages/maths.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 6e9786a474..aa15666a5c 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -26,7 +26,7 @@ ;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; Copyright © 2018 Nadya Voronova ;;; Copyright © 2018 Adam Massmann -;;; Copyright © 2018, 2020, 2021 Marius Bakke +;;; Copyright © 2018, 2020-2022 Marius Bakke ;;; Copyright © 2018 Eric Brown ;;; Copyright © 2018, 2021 Julien Lepiller ;;; Copyright © 2018 Amin Bandali @@ -5111,6 +5111,13 @@ (define-public glm (build-system cmake-build-system) (arguments `(#:phases (modify-phases %standard-phases + (add-before 'configure 'set-environment + (lambda _ + ;; Pass "-fno-ipa-modref" flag to the compiler to work + ;; around a test failure with GCC 11. This is a + ;; header-only library so these flags only affect tests. + ;; See . + (setenv "CXXFLAGS" "-O2 -g -fno-ipa-modref"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) ;; Since version 0.9.9.6, 'make install' is not supported From patchwork Thu Sep 1 22:29:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 42131 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AB7BC27BBEC; Thu, 1 Sep 2022 23:31:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3B97F27BBE9 for ; Thu, 1 Sep 2022 23:31:16 +0100 (BST) Received: from localhost ([::1]:50500 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oTsiR-0005Vy-CV for patchwork@mira.cbaines.net; Thu, 01 Sep 2022 18:31:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oTsiG-0005V9-43 for guix-patches@gnu.org; Thu, 01 Sep 2022 18:31:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54601) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oTsiF-0005Zk-Rr for guix-patches@gnu.org; Thu, 01 Sep 2022 18:31:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oTsiF-00036L-NM for guix-patches@gnu.org; Thu, 01 Sep 2022 18:31:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57533] [PATCH core-updates 5/5] gnu: clang-runtime: Remove obsolete workaround. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Sep 2022 22:31:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57533 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57533@debbugs.gnu.org Received: via spool by 57533-submit@debbugs.gnu.org id=B57533.166207144311867 (code B ref 57533); Thu, 01 Sep 2022 22:31:03 +0000 Received: (at 57533) by debbugs.gnu.org; 1 Sep 2022 22:30:43 +0000 Received: from localhost ([127.0.0.1]:44346 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oTshu-00035J-P8 for submit@debbugs.gnu.org; Thu, 01 Sep 2022 18:30:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50498) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oTshs-00034X-W1 for 57533@debbugs.gnu.org; Thu, 01 Sep 2022 18:30:41 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:41500) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oTshn-0005UV-Pc for 57533@debbugs.gnu.org; Thu, 01 Sep 2022 18:30:35 -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=P/PKzORHyZJcD5f0jcmp7QbWLLxl+urKa7YquTEzPv4=; b=VWkZsMUgAk5o8uX6iws3 LoGNwYjy6zb+3iMHGGCoUnmH2BhQlEu3b2Wsuqos3NMRWJYP9gbjNt6Qeu7q1hn4kDsNlyD8XRFUM 94Dz/et/DvNwJgzZHsD32lJqds1ms7pBA7RFAUJ9cyIvXqiBMrtDbBUFpQpplK76ULQn7bhziJwgV b8JsNlYNcmZpUxSDCCzWoWancS22DaaxlMRBguGDpatNfWj8gXQPyLns052eggu18WzKPw1ka0j39 SmvVgfKrGZfWONKxWbMwADOpXKIixAl3aOFTCIBPaqA4i0OHOmZeITHAToFFIDPoinNv+9aGoOB+k WzAm2TbTO6fcAA==; Received: from [84.214.173.6] (port=50716 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oTshn-0001xw-AA for 57533@debbugs.gnu.org; Thu, 01 Sep 2022 18:30:35 -0400 From: Marius Bakke Date: Fri, 2 Sep 2022 00:29:57 +0200 Message-Id: <20220901222957.15383-5-marius@gnu.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220901222957.15383-1-marius@gnu.org> References: <20220901222413.14482-1-marius@gnu.org> <20220901222957.15383-1-marius@gnu.org> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/llvm.scm (clang-runtime-14)[native-inputs]: Remove. --- gnu/packages/llvm.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 0e9cf771f7..060cfac2c9 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -634,11 +634,7 @@ (define-public clang-runtime-14 #~(modify-phases #$phases (add-after 'unpack 'change-directory (lambda _ - (chdir "compiler-rt"))))))) - (native-inputs - `(;; FIXME: libfuzzer fails to build with GCC 10. - ("gcc" ,gcc-11) - ,@(package-native-inputs template)))))) + (chdir "compiler-rt")))))))))) (define-public clang-14 (let ((template