From patchwork Thu Sep 24 14:12:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 24273 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 4DD6827BBE9; Thu, 24 Sep 2020 15:13:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D8C8127BBE8 for ; Thu, 24 Sep 2020 15:13:09 +0100 (BST) Received: from localhost ([::1]:51752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLRzh-00018S-1c for patchwork@mira.cbaines.net; Thu, 24 Sep 2020 10:13:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54592) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLRza-00018G-UC for guix-patches@gnu.org; Thu, 24 Sep 2020 10:13:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57807) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kLRza-0001kL-L4 for guix-patches@gnu.org; Thu, 24 Sep 2020 10:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kLRza-0001eW-FE for guix-patches@gnu.org; Thu, 24 Sep 2020 10:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43591] [PATCH core-updates] gnu: glibc-final: Catch all cases of a glibc user not requesting 64-bit offsets and then using readdir. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 24 Sep 2020 14:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 43591 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43591@debbugs.gnu.org Cc: Danny Milosavljevic X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16009567626322 (code B ref -1); Thu, 24 Sep 2020 14:13:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Sep 2020 14:12:42 +0000 Received: from localhost ([127.0.0.1]:41120 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLRzF-0001dt-L1 for submit@debbugs.gnu.org; Thu, 24 Sep 2020 10:12:41 -0400 Received: from lists.gnu.org ([209.51.188.17]:45812) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLRzD-0001dj-8g for submit@debbugs.gnu.org; Thu, 24 Sep 2020 10:12:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54508) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLRzD-0000qw-1H for guix-patches@gnu.org; Thu, 24 Sep 2020 10:12:39 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:58664) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLRzA-0001i1-F6 for guix-patches@gnu.org; Thu, 24 Sep 2020 10:12:38 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 062F3336819A; Thu, 24 Sep 2020 16:12:33 +0200 (CEST) From: Danny Milosavljevic Date: Thu, 24 Sep 2020 16:12:11 +0200 Message-Id: <20200924141211.21649-1-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Tags: patch Received-SPF: none client-ip=85.13.145.193; envelope-from=dannym@scratchpost.org; helo=dd26836.kasserver.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/24 09:45:53 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 (glibc-final): Catch all cases of a glibc user not requesting 64-bit offsets and then using readdir. --- gnu/packages/commencement.scm | 52 ++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index e5a4caa95c..5a62c9df3a 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3462,7 +3462,57 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ,hurd-headers-boot0) '()) ,@(package-outputs glibc-final-with-bootstrap-bash)) - ,@(package-arguments glibc-final-with-bootstrap-bash))))) + ,@(substitute-keyword-arguments + (package-arguments glibc-final-with-bootstrap-bash) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'patch-dirent + (lambda* (#:key outputs #:allow-other-keys) + ;; QEMU transparent emulation is in somewhat of a pickle sometimes. + ;; There is no support in the kernel syscalls of specifying what + ;; kind of userspace you are emulating. Some parts of the + ;; structures passed back-and-forth between kernel and guest + ;; userspace can change size (including size of individual fields). + ;; + ;; One of the affected structures is "struct dirent". The ext4 + ;; file system puts a 64 bit hash into "d_off" on the kernel side. + ;; If the guest system's glibc is 32 bit it is going to be very + ;; confused (it does check whether d_off fits into the structure + ;; it gives back to the user--and it doesn't fit. Hence readdir + ;; fails). + ;; This manifests itself in simple directory reads not working + ;; anymore in parts of cmake, for example. + ;; + ;; There is a very simple and complete way to avoid this problem: + ;; Just always use 64 bit offsets in user space programs (also + ;; on 32 bit machines). + ;; + ;; Note: We might want to avoid using 64 bit when bootstrapping + ;; using mescc (since mescc doesn't directly support 64 bit + ;; values)--but then bootstrapping has to be done on a + ;; file system other than ext4, or on ext4 with the feature + ;; "dir_index" disabled. + ;; + ;; The change below does not affect 64 bit users. + ;; + ;; See . + (let ((port (open-file "include/dirent.h" "a"))) + (display " +#if __SIZEOF_LONG__ < 8 +#ifndef __USE_FILE_OFFSET64 +#undef readdir +#define readdir @READDIR_WITHOUT_FILE_OFFSET64_IS_A_REALLY_BAD_IDEA@ +#endif +#endif +" port) + (close-port port)) + ;; This file includes and thus checks sanity already. + ;; TODO: Check dirent/scandir-tail.c, dirent/scandir64-tail.c. + (substitute* "posix/glob.c" + (("(#[ ]*define[ ][ ]*readdir)") " +#undef readdir +#define readdir")) + #t))))))))) (define/system-dependent gcc-boot0-wrapped ;; Make the cross-tools GCC-BOOT0 and BINUTILS-BOOT0 available under the From patchwork Wed Sep 30 08:45:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 24381 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 015AC27BBEA; Wed, 30 Sep 2020 09:46:50 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7695B27BBE8 for ; Wed, 30 Sep 2020 09:46:49 +0100 (BST) Received: from localhost ([::1]:34900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNXlA-0005DT-M0 for patchwork@mira.cbaines.net; Wed, 30 Sep 2020 04:46:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53184) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNXkR-0005Ac-Pb for guix-patches@gnu.org; Wed, 30 Sep 2020 04:46:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46544) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNXkR-0008EV-Gh for guix-patches@gnu.org; Wed, 30 Sep 2020 04:46:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNXkR-0005Gp-Eq for guix-patches@gnu.org; Wed, 30 Sep 2020 04:46:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43591] [PATCH core-updates v2 2/5] build-system/gnu: Explicity declare the _FILE_OFFSET_BITS we want. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 30 Sep 2020 08:46:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43591 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43591@debbugs.gnu.org Cc: Danny Milosavljevic Received: via spool by 43591-submit@debbugs.gnu.org id=B43591.160145556120205 (code B ref 43591); Wed, 30 Sep 2020 08:46:03 +0000 Received: (at 43591) by debbugs.gnu.org; 30 Sep 2020 08:46:01 +0000 Received: from localhost ([127.0.0.1]:58083 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNXkO-0005Fi-UX for submit@debbugs.gnu.org; Wed, 30 Sep 2020 04:46:01 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:33118) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNXkL-0005En-8F for 43591@debbugs.gnu.org; Wed, 30 Sep 2020 04:45:58 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 365DD336344D; Wed, 30 Sep 2020 10:45:56 +0200 (CEST) From: Danny Milosavljevic Date: Wed, 30 Sep 2020 10:45:09 +0200 Message-Id: <20200930084512.31738-3-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200930084512.31738-1-dannym@scratchpost.org> References: <20200924141211.21649-1-dannym@scratchpost.org> <20200930084512.31738-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch 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/gnu-build-system.scm (set-FILE-OFFSET-BITS): New procedure. (%standard-phases): Add it. --- guix/build/gnu-build-system.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index d3347c9518..1a1c4627ab 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -60,6 +60,17 @@ See https://reproducible-builds.org/specs/source-date-epoch/." (setenv "SOURCE_DATE_EPOCH" "1") #t) +(define* (set-FILE-OFFSET-BITS #:rest _) + "Define '_FILE_OFFSET_BITS' using the C preprocessor. +This ensures that 32 bit and 64 bit user space both can handle results +returned from a 64 bit kernel. +See https://bugzilla.kernel.org/show_bug.cgi?id=205957." + ;; Setting CFLAGS here makes packages not default CFLAGS. + ;; Since glibc (and probably other packages) don't like being built without optimization, enable optimization here. + (setenv "CFLAGS" "-D_FILE_OFFSET_BITS=64 -g -O2") + (setenv "CXXFLAGS" "-D_FILE_OFFSET_BITS=64 -g -O2") + #t) + (define (first-subdirectory directory) "Return the file name of the first sub-directory of DIRECTORY." (match (scandir directory @@ -803,7 +814,7 @@ which cannot be found~%" ;; Standard build phases, as a list of symbol/procedure pairs. (let-syntax ((phases (syntax-rules () ((_ p ...) `((p . ,p) ...))))) - (phases set-SOURCE-DATE-EPOCH set-paths install-locale unpack + (phases set-SOURCE-DATE-EPOCH set-FILE-OFFSET-BITS set-paths install-locale unpack bootstrap patch-usr-bin-file patch-source-shebangs configure patch-generated-file-shebangs From patchwork Wed Sep 30 08:45:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 24379 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 1665C27BBE9; Wed, 30 Sep 2020 09:46:39 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C302627BBE8 for ; Wed, 30 Sep 2020 09:46:38 +0100 (BST) Received: from localhost ([::1]:34800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNXkt-0005Ak-OH for patchwork@mira.cbaines.net; Wed, 30 Sep 2020 04:46:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNXkQ-0005AG-Jh for guix-patches@gnu.org; Wed, 30 Sep 2020 04:46:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46541) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNXkQ-0008EJ-AX for guix-patches@gnu.org; Wed, 30 Sep 2020 04:46:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNXkQ-0005GE-5E for guix-patches@gnu.org; Wed, 30 Sep 2020 04:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43591] [PATCH core-updates v2 3/5] gnu: glibc: Do not explicitly set _FILE_OFFSET_BITS. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 30 Sep 2020 08:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43591 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43591@debbugs.gnu.org Cc: Danny Milosavljevic Received: via spool by 43591-submit@debbugs.gnu.org id=B43591.160145556020182 (code B ref 43591); Wed, 30 Sep 2020 08:46:02 +0000 Received: (at 43591) by debbugs.gnu.org; 30 Sep 2020 08:46:00 +0000 Received: from localhost ([127.0.0.1]:58077 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNXkN-0005FR-KH for submit@debbugs.gnu.org; Wed, 30 Sep 2020 04:45:59 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:33120) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNXkL-0005Eo-Ag for 43591@debbugs.gnu.org; Wed, 30 Sep 2020 04:45:57 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 77B233363306; Wed, 30 Sep 2020 10:45:56 +0200 (CEST) From: Danny Milosavljevic Date: Wed, 30 Sep 2020 10:45:10 +0200 Message-Id: <20200930084512.31738-4-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200930084512.31738-1-dannym@scratchpost.org> References: <20200924141211.21649-1-dannym@scratchpost.org> <20200930084512.31738-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch 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/base.scm (glibc)[arguments]<#:phases>[set-FILE-OFFSET-BITS]: Delete phase. --- gnu/packages/base.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 41976c5ab0..6f3c717b50 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -782,6 +782,8 @@ the store.") #:tests? #f ; XXX #:phases (modify-phases %standard-phases + ;; glibc itself should support both--so don't choose here. + (delete 'set-FILE-OFFSET-BITS) (add-before 'configure 'pre-configure (lambda* (#:key inputs native-inputs outputs From patchwork Wed Sep 30 08:45:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 24380 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 C579427BBE9; Wed, 30 Sep 2020 09:46:48 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7CE9B27BBE8 for ; Wed, 30 Sep 2020 09:46:48 +0100 (BST) Received: from localhost ([::1]:34824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNXl9-0005Bc-J0 for patchwork@mira.cbaines.net; Wed, 30 Sep 2020 04:46:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53182) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNXkR-0005AV-At for guix-patches@gnu.org; Wed, 30 Sep 2020 04:46:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46543) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNXkR-0008ER-1D for guix-patches@gnu.org; Wed, 30 Sep 2020 04:46:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNXkQ-0005Ga-Vz for guix-patches@gnu.org; Wed, 30 Sep 2020 04:46:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43591] [PATCH core-updates v2 4/5] gnu: glibc-mesboot0: Do not explicitly set _FILE_OFFSET_BITS. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 30 Sep 2020 08:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43591 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43591@debbugs.gnu.org Cc: Danny Milosavljevic Received: via spool by 43591-submit@debbugs.gnu.org id=B43591.160145556120197 (code B ref 43591); Wed, 30 Sep 2020 08:46:02 +0000 Received: (at 43591) by debbugs.gnu.org; 30 Sep 2020 08:46:01 +0000 Received: from localhost ([127.0.0.1]:58081 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNXkO-0005Fb-4g for submit@debbugs.gnu.org; Wed, 30 Sep 2020 04:46:00 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:33122) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNXkL-0005Ep-FD for 43591@debbugs.gnu.org; Wed, 30 Sep 2020 04:45:58 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id B52683363452; Wed, 30 Sep 2020 10:45:56 +0200 (CEST) From: Danny Milosavljevic Date: Wed, 30 Sep 2020 10:45:11 +0200 Message-Id: <20200930084512.31738-5-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200930084512.31738-1-dannym@scratchpost.org> References: <20200924141211.21649-1-dannym@scratchpost.org> <20200930084512.31738-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch 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 (glibc-mesboot0)[arguments]<#:phases>[set-FILE-OFFSET-BITS]: Delete phase. --- gnu/packages/commencement.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 284fa65d20..ad6a27ba6b 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1398,6 +1398,8 @@ ac_cv_c_float_format='IEEE (little-endian)' ,(string-append "--prefix=" out))) #:phases (modify-phases %standard-phases + ;; glibc itself should support both--so don't choose here. + (delete 'set-FILE-OFFSET-BITS) (add-after 'unpack 'apply-boot-patch (lambda* (#:key inputs #:allow-other-keys) (and (let ((patch (assoc-ref inputs "boot-patch")))