From patchwork Sat Feb 12 21:45:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 37221 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 801F127BBEA; Sat, 12 Feb 2022 21:46:41 +0000 (GMT) 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 6724327BBE9 for ; Sat, 12 Feb 2022 21:46:40 +0000 (GMT) Received: from localhost ([::1]:48278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJ0E2-0004ik-V4 for patchwork@mira.cbaines.net; Sat, 12 Feb 2022 16:46:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52306) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJ0DT-0004Db-GI for guix-patches@gnu.org; Sat, 12 Feb 2022 16:46:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41935) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJ0DT-0002xA-5X for guix-patches@gnu.org; Sat, 12 Feb 2022 16:46:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nJ0DT-0008Vx-4L for guix-patches@gnu.org; Sat, 12 Feb 2022 16:46:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53964] [PATCH 4/4] gnu: Remove glibc@2.2.5 and gcc-2.95-wrapper. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 12 Feb 2022 21:46:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53964 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53964@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 53964-submit@debbugs.gnu.org id=B53964.164470235632287 (code B ref 53964); Sat, 12 Feb 2022 21:46:03 +0000 Received: (at 53964) by debbugs.gnu.org; 12 Feb 2022 21:45:56 +0000 Received: from localhost ([127.0.0.1]:35829 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nJ0DK-0008O5-VI for submit@debbugs.gnu.org; Sat, 12 Feb 2022 16:45:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45598) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nJ0DC-0008Bg-FG for 53964@debbugs.gnu.org; Sat, 12 Feb 2022 16:45:48 -0500 Received: from [2001:470:142:3::e] (port=50942 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJ0D7-0002ot-69; Sat, 12 Feb 2022 16:45:41 -0500 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=wlMx4OVqoJwawGXT3ed6c9RnrMllDTVGJwT0RD/0Oos=; b=M+7+Ejsfyv6J5U97umWf XqToSqlSpfDjh9u0Bv/5mz83fLnboDQzMd29mLNeFdZtX7A7//6qIQVHCeAQ0xUcWb/8JjqDEUfak uqMPKyeTFcB6jAd7ykctRqkPc4dzWdH0tKRZo4ICrCS1k0yOiT3U/j78thZM4MPK+fZprPclH7Kzh E47BMnV4iNAlWQGXZ7Vm8uB/TpEobriuwsTWm64MiYxMBy/qAU/R5IfEB3PqXSS//DdJVHXqj17hz WOCaaqPN1+eV5EH7WmBuDxG55i275IFuuky7QX00jA19LYoqKTnxVAlvE/C73TiqiCr8IftfjYPZX 4MZQexaLFYkPWQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:56748 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJ0D6-00034N-PG; Sat, 12 Feb 2022 16:45:41 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sat, 12 Feb 2022 22:45:32 +0100 Message-Id: <20220212214532.23087-4-ludo@gnu.org> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220212214532.23087-1-ludo@gnu.org> References: <20220212214532.23087-1-ludo@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 This reverts commits a95924c9ac3f238cde243c96d552ff59ad77ca16 and defa85b26537a3cc20624fb9dbcae906226361d5, which were used to build nhc98@1.22 but are no longer needed. * gnu/packages/base.scm (glibc-2.2.5): Remove. * gnu/packages/commencement.scm (gcc-2.95-wrapper): Remove. (glibc-mesboot0, gcc-mesboot0, binutils-mesboot): Keep private. --- gnu/packages/base.scm | 99 ----------------------------------- gnu/packages/commencement.scm | 63 ++-------------------- 2 files changed, 3 insertions(+), 159 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 32a462b545..76a65f25b3 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1015,105 +1015,6 @@ (define-public glibc-2.29 "glibc-reinstate-prlimit64-fallback.patch" "glibc-2.29-supported-locales.patch")))))) - -(define-public glibc-2.2.5 - (package - (inherit glibc) - (version "2.2.5") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.gz")) - (patches (search-patches "glibc-boot-2.2.5.patch" - "glibc-bootstrap-system-2.2.5.patch")) - (sha256 - (base32 - "1vl48i16gx6h68whjyhgnn1s57vqq32f9ygfa2fls7pdkbsqvp2q")))) - (arguments - (list #:system "i686-linux" - #:implicit-inputs? #f - #:tests? #f - #:strip-binaries? #f - #:validate-runpath? #f - #:parallel-build? #f ; gcc-2.95.3 ICEs on massively parallel builds - #:make-flags - #~(list (string-append - "SHELL=" #$(this-package-native-input "bash") "/bin/sh")) - #:configure-flags - #~(list "--enable-shared" - "--enable-static" - "--disable-sanity-checks" - "--build=i686-unknown-linux-gnu" - "--host=i686-unknown-linux-gnu" - (string-append "--with-headers=" - #$(this-package-native-input "kernel-headers") - "/include") - "--enable-static-nss" - "--without-__thread" - "--without-cvs" - "--without-gd" - "--without-tls" - (string-append "--prefix=" #$output)) - #:phases - #~(modify-phases %standard-phases - (add-before 'configure 'setenv - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bash (assoc-ref inputs "bash")) - (shell (string-append bash "/bin/bash")) - (gcc (assoc-ref inputs "gcc")) - (cppflags (string-append - " -D MES_BOOTSTRAP=1" - " -D BOOTSTRAP_GLIBC=1")) - (cflags (string-append " -L " (getcwd)))) - (setenv "CONFIG_SHELL" shell) - (setenv "SHELL" shell) - (setenv "CPP" (string-append gcc "/bin/gcc -E " cppflags)) - (setenv "CC" (string-append gcc "/bin/gcc " cppflags cflags))))) - (replace 'configure ; needs classic invocation of configure - (lambda* (#:key configure-flags #:allow-other-keys) - (format (current-error-port) - "running ./configure ~a\n" (string-join configure-flags)) - (apply invoke "./configure" configure-flags))) - (add-after 'configure 'fixup-configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bash (assoc-ref inputs "bash")) - (shell (string-append bash "/bin/bash"))) - (substitute* "config.make" - (("INSTALL = scripts/") "INSTALL = $(..)./scripts/")) - (substitute* "config.make" - (("INSTALL = scripts/") "INSTALL = $(..)./scripts/") - (("BASH = ") (string-append - "SHELL = " shell " - BASH = "))))))))) - (supported-systems '("i686-linux" "x86_64-linux")) - (outputs '("out")) - (inputs '()) - (propagated-inputs '()) - (native-inputs - ;; Lazily resolve NAME in (gnu packages commencement) to avoid a cycle. - (let ((c (lambda (name) - (module-ref (resolve-interface - '(gnu packages commencement)) - name)))) - `(("bash" ,bash-minimal) - ("coreutils" ,coreutils) - ("gawk" ,gawk) - ("grep" ,grep) - ("make" ,gnu-make) - ("sed" ,sed) - ("tar" ,tar) - ("bzip2" ,bzip2) - ("gzip" ,gzip) - ("patch" ,patch) - ("xz" ,xz) - ("kernel-headers" ,linux-libre-headers) - - ;; Old toolchain - ("gcc" ,(c 'gcc-mesboot0)) - ("binutils" ,(c 'binutils-mesboot)) - ("libc" ,(c 'glibc-mesboot0))))))) - (define-public (make-gcc-libc base-gcc libc) "Return a GCC that targets LIBC." (package (inherit base-gcc) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 76e879b47b..cdc9c1d621 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1265,7 +1265,7 @@ (define gawk-mesboot0 (install-file "gawk" bin) (symlink "gawk" (string-append bin "/awk")))))))))) -(define-public glibc-mesboot0 +(define glibc-mesboot0 ;; GNU C Library 2.2.5 is the most recent glibc that we managed to build ;; using gcc-2.95.3. Newer versions (2.3.x, 2.6, 2.1x) seem to need a newer ;; gcc. @@ -1359,7 +1359,7 @@ (define-public glibc-mesboot0 "SHELL = " shell " BASH = "))))))))))) -(define-public gcc-mesboot0 +(define gcc-mesboot0 (package (inherit gcc-core-mesboot0) (name "gcc-mesboot0") @@ -1403,63 +1403,6 @@ (define-public gcc-mesboot0 ,(string-append "LIBGCC2_INCLUDES=-I " gcc "/include") "LANGUAGES=c"))))))) -(define-public gcc-2.95-wrapper - ;; We need this so gcc-mesboot0 can be used to create shared binaries that - ;; have the correct interpreter, otherwise configuring gcc-mesboot using - ;; --enable-shared will fail. - (package - (inherit gcc-mesboot0) - (name "gcc-wrapper") - (source #f) - (inputs '()) - (native-inputs - `(("bash" ,bash-minimal) - ("coreutils" ,coreutils) - ("libc" ,glibc-2.2.5) - ("gcc" ,gcc-mesboot0))) - (arguments - `(#:implicit-inputs? #f - #:phases - (modify-phases %standard-phases - (delete 'unpack) - (delete 'configure) - (delete 'install) - (replace 'build - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bash (assoc-ref inputs "bash")) - (libc (assoc-ref inputs "libc")) - (gcc (assoc-ref inputs "gcc")) - (bin (string-append out "/bin"))) - (mkdir-p bin) - (for-each - (lambda (program) - (let ((wrapper (string-append bin "/" program))) - (with-output-to-file wrapper - (lambda _ - (display (string-append "#! " bash "/bin/bash -exec " gcc "/bin/" program -" -Wl,--dynamic-linker" -;; also for x86_64-linux, we are still on i686-linux -" -Wl," libc ,(glibc-dynamic-linker "i686-linux") -" -Wl,--rpath" -" -Wl," libc "/lib" -" \"$@\" -")) - (chmod wrapper #o555))))) - '("cpp" - "gcc" - "g++" - "i686-unknown-linux-gnu-cpp" - "i686-unknown-linux-gnu-gcc" - "i686-unknown-linux-gnu-g++"))))) - (replace 'check - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (program (string-append bin "/gcc"))) - (invoke program "--help"))))))))) - (define (%boot-mesboot0-inputs) `(("gcc" ,gcc-mesboot0) ("kernel-headers" ,%bootstrap-linux-libre-headers) @@ -2050,7 +1993,7 @@ (define hello-mesboot (lambda _ (invoke "./hello")))))))) -(define-public binutils-mesboot +(define binutils-mesboot (package (inherit binutils) (name "binutils-mesboot")