From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id majcEdfIL2J9kgAAgWs5BA (envelope-from ) for ; Mon, 14 Mar 2022 23:59:35 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 2MRKCdfIL2K6JQAAG6o9tA (envelope-from ) for ; Mon, 14 Mar 2022 23:59:35 +0100 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 ADF503E22A for ; Mon, 14 Mar 2022 23:59:34 +0100 (CET) Received: from localhost ([::1]:55732 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nTtf3-0001fj-Ov for larch@yhetil.org; Mon, 14 Mar 2022 18:59:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nTtea-0000eH-DA for guix-patches@gnu.org; Mon, 14 Mar 2022 18:59:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53020) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nTtea-00055F-45 for guix-patches@gnu.org; Mon, 14 Mar 2022 18:59:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nTtea-000575-3C for guix-patches@gnu.org; Mon, 14 Mar 2022 18:59:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54394] [PATCH core-updates 10/12] gnu: binutils-mesboot0: Update to 2.20.1a. Resent-From: Timothy Sample Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Mar 2022 22:59:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54394 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54394@debbugs.gnu.org Cc: Timothy Sample Received: via spool by 54394-submit@debbugs.gnu.org id=B54394.164729871019542 (code B ref 54394); Mon, 14 Mar 2022 22:59:04 +0000 Received: (at 54394) by debbugs.gnu.org; 14 Mar 2022 22:58:30 +0000 Received: from localhost ([127.0.0.1]:46903 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTte2-000556-9u for submit@debbugs.gnu.org; Mon, 14 Mar 2022 18:58:30 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:55655) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTte0-00054i-7r for 54394@debbugs.gnu.org; Mon, 14 Mar 2022 18:58:28 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 19E475C0262; Mon, 14 Mar 2022 18:58:23 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 14 Mar 2022 18:58:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=3MZ1g6 KpJPRr6bOdyMT7+VbTPyw8v+7zvU3JfYNjve0=; b=mdbpFqf6haJ5V0/YHn5LcW +TBHcVxVRZYdYafqxBW5Eii6xz9AbtQLXhly+AqHziFD2SfRzTkjF0uJOfuAdR4u q6lSWS94QBGcKtZHDioA8he/ByUXmT1pqUOBCJH+ljnK37r/IIlDrv9UbeHKLgFN U35eM0P+d5Ab6Q4EmFNaRNHNahkf9WrUT/DdmVqDrcKs7dcdCTbi9FuIlkMt1GEY WBy8oc2YXz/ABiUtXPG0qnDFe9csJlA53gLAVoRlHcm2ein6AitFGz7maYgcahT5 tBPZJiMeyueJoguOnERw6R7ibJmDGTqTFPXCJiAyFME8UAbO8UCYp01pXx0Pt4jQ == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddruddvledgtddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepvfhimhhothhhhicuufgrmhhplhgvuceoshgrmhhplhgvthes nhhghihrohdrtghomheqnecuggftrfgrthhtvghrnheptdevieffudevieeitdehieevie ethfegveelgeetveehvdffiedvffduuddukedunecuvehluhhsthgvrhfuihiivgepfeen ucfrrghrrghmpehmrghilhhfrhhomhepshgrmhhplhgvthesnhhghihrohdrtghomh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 14 Mar 2022 18:58:22 -0400 (EDT) From: Timothy Sample Date: Mon, 14 Mar 2022 16:57:09 -0600 Message-Id: <20220314225712.19869-10-samplet@ngyro.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <87v8wg40dl.fsf@ngyro.com> References: <87v8wg40dl.fsf@ngyro.com> MIME-Version: 1.0 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" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1647298774; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=3MZ1g6KpJPRr6bOdyMT7+VbTPyw8v+7zvU3JfYNjve0=; b=glTvH/LGzqjKR3mJ5E3m+EeHgd1HGfFZ+LM/PUs62ALAJGGmxkqMV2/ylQqhp5jAVzvBIz Z0yuiuxy98j9cTZJog6NuYg97Ss0qDph2RYX+xftGZQ+slY7Q3SCrbdZCRJyfK1ewmi/Le CHNihXXTBEHtEHUGLEwjjRKSSftGXROY+4OClAqpy4QYjqzrQzwgt1WC4lnH86QEjp4scP LBjTMnN2pdmDaWm0wlLPBeHPjEbVETnZMnAMpdM0uJEotbh5uJ9rqeN1QIl3zsslJKbTW4 Xl4os4nmYskrk9vBety9g5xmCE4GMFAFn9DYH3dr3vcQM/+b5MIKTib5rClDMA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1647298774; a=rsa-sha256; cv=none; b=K4viaFDCcEMKd8tXM0mST/n7RZuE06GN3tTylyyAUiCGr9KohjBigsgcQ5ATYyWSlIHby2 9/wPJ1Hb4wjfCLjumhk331GmRcBeJcB7WQTpphbaourSIWiieZSMi9IIOXgR4chJKN4iO9 3pIku+xsmWUqT63ZNkISt3eOKfqPlpZStJwBYHX/Ek4y1mlUsSmcpkX9uRJJmjIWJ+yMlD Agd+cGV2cpTgzSQkqqR9+pExPk5VS57PTOaXzJFgO/GG66orqhO7Cc1dZJsiWoPurFMrpR +PFTFH73kJeGMPVwipIK9ogmvtouS2eiH1spj0igJwA9zRTNus29XvFKI8C0Rg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b=mdbpFqf6; dmarc=none; 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" X-Migadu-Spam-Score: 0.92 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b=mdbpFqf6; dmarc=none; 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" X-Migadu-Queue-Id: ADF503E22A X-Spam-Score: 0.92 X-Migadu-Scanner: scn0.migadu.com X-TUID: ZVwLeMRZIEdu This restores the package to how it was before the Scheme-only bootstrap. See cb167958ea904fc79913b883cb771e2d691402e0. * gnu/packages/commencement.scm (binutils-mesboot0): Update to 2.20.1a. (binutils-mesboot1)[arguments]: Remove #:phases substitution. (binutils-mesboot): Inherit from binutils-mesboot1, changing only the native-inputs field. --- gnu/packages/commencement.scm | 140 +++++++--------------------------- 1 file changed, 27 insertions(+), 113 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 49b7defffb..6dd480dc11 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -894,14 +894,17 @@ (define binutils-mesboot0 (package (inherit binutils) (name "binutils-mesboot0") - (version "2.14") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/binutils/binutils-" - version ".tar.gz")) - (sha256 - (base32 - "1w8xp7k44bkijr974x9918i4p1sw4g2fcd5mxvspkjpg38m214ds")))) + (version "2.20.1a") + (source (bootstrap-origin + (origin + (method url-fetch) + (uri (string-append "mirror://gnu/binutils/binutils-" + version ".tar.bz2")) + (patches (search-patches "binutils-boot-2.20.1a.patch")) + (patch-guile %bootstrap-guile) + (sha256 + (base32 + "0r7dr0brfpchh5ic0z9r4yxqn4ybzmlh25sbp30cacqk8nb7rlvi"))))) (inputs '()) (propagated-inputs '()) (native-inputs (%boot-tcc-inputs)) @@ -913,40 +916,21 @@ (define binutils-mesboot0 #:parallel-build? #f #:strip-binaries? #f ; no strip yet #:configure-flags - (let ((out (assoc-ref %outputs "out"))) - `("--disable-nls" + (let ((cppflags (string-append " -D __GLIBC_MINOR__=6" + " -D MES_BOOTSTRAP=1")) + (bash (assoc-ref %build-inputs "bash"))) + `(,(string-append "CONFIG_SHELL=" bash "/bin/sh") + ,(string-append "CPPFLAGS=" cppflags) + "AR=tcc -ar" + "CXX=false" + "RANLIB=true" + ,(string-append "CC=tcc" cppflags) + "--disable-nls" "--disable-shared" "--disable-werror" - "--build=i386-unknown-linux" - "--host=i386-unknown-linux" - "--target=i386-unknown-linux" - "--with-sysroot=/" - ,(string-append "--prefix=" out))) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'setenv - (lambda _ - (let* ((out (assoc-ref %outputs "out")) - (bash (assoc-ref %build-inputs "bash")) - (shell (string-append bash "/bin/bash"))) - (setenv "CONFIG_SHELL" shell) - (setenv "SHELL" shell) - (setenv "AR" "tcc -ar") - (setenv "RANLIB" "true") - (setenv "CC" "tcc -D __GLIBC_MINOR__=6")))) - (add-after 'unpack 'scripted-patch - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "bfd/configure" - (("^sed -e '/SRC-POTFILES.*" all) - "echo -e 'all:\\n\\ttrue\\n\\ninstall:\\n\\ttrue\\n' > po/Makefile\n")))) - (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 system* "./configure" configure-flags) - (substitute* "config.status" - (("[.]//dev/null") "/dev/null")) - (invoke "sh" "./config.status")))))))) + "--build=i686-unknown-linux-gnu" + "--host=i686-unknown-linux-gnu" + "--with-sysroot=/")))))) (define gcc-core-mesboot0 ;; Gcc-2.95.3 is the most recent GCC that is supported by what the Mes C @@ -1420,15 +1404,7 @@ (define binutils-mesboot1 "--build=i686-unknown-linux-gnu" "--host=i686-unknown-linux-gnu" "--with-sysroot=/" - ,(string-append "--prefix=" out)))) - ((#:phases phases) - `(modify-phases ,phases - (replace 'setenv - (lambda _ - (let* ((out (assoc-ref %outputs "out")) - (bash (assoc-ref %build-inputs "bash")) - (shell (string-append bash "/bin/bash"))) - (setenv "CONFIG_SHELL" shell)))))))))) + ,(string-append "--prefix=" out)))))))) (define coreutils-mesboot0 (package @@ -1911,72 +1887,10 @@ (define hello-mesboot (define binutils-mesboot (package - (inherit binutils) + (inherit binutils-mesboot1) (name "binutils-mesboot") - (version "2.20.1a") - (source (bootstrap-origin - (origin - (method url-fetch) - (uri (string-append "mirror://gnu/binutils/binutils-" - version ".tar.bz2")) - (patches (search-patches "binutils-boot-2.20.1a.patch")) - (sha256 - (base32 - "0r7dr0brfpchh5ic0z9r4yxqn4ybzmlh25sbp30cacqk8nb7rlvi"))))) - (inputs '()) - (propagated-inputs '()) (native-inputs `(("xz" ,xz-mesboot) - ,@(%boot-mesboot2-inputs))) - (supported-systems '("i686-linux" "x86_64-linux")) - (arguments - `(#:implicit-inputs? #f - #:guile ,%bootstrap-guile - #:tests? #f ; runtest: command not found - #:parallel-build? #f - #:strip-binaries? #f ; no strip yet - #:configure-flags - `("CC=gcc" - "CXX=false" - "RANLIB=true" - "--disable-doc" - "--disable-nls" - "--disable-shared" - "--disable-werror" - "--build=i686-unknown-linux-gnu" - "--host=i686-unknown-linux-gnu" - "--with-sysroot=/" - ;; checking for grep that handles long lines and -e - "ac_cv_path_GREP=grep") - ;; FIXME: ac_cv_path_GREP=grep doesn't seem to be forwarded to - ;; cascading configure's? - #:make-flags '("ac_cv_path_GREP=grep") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'scripted-patch - (lambda _ - ;; sed-mesboot0 cannot build these - (copy-file "binutils/Makefile.in" "binutils/Makefile.in.orig") - (substitute* "binutils/Makefile.in" - ;; binutils/binutils uses an amazingly complex install - ;; command, using FOR, SED, READ, IF, ECHO, SED, SED, AWK, - ;; READ, and then LIBTOOL (to do something like - ;; `mkdir $DESTDIR$bindir; cp readline $DESTDIR$bindir ...') - - ;; Some tool [debugme!] cannot handle two escaped newlines - ;; (bash?), and the install stops after $(am__EXEEXT_11) - ;; ("objcopy"), so $(am__EXEEXT_13) ("readelf") and others do - ;; not get installed. Remove the stray newline: - (("^\t@BUILD_NLMCONV@ @BUILD_SRCONV@ @BUILD_DLLTOOL@ @BUILD_WINDRES@ .*") "")) - (substitute* "opcodes/Makefile.in" - (("^SUBDIRS = [.] po") "SUBDIRS = .")) - (substitute* "binutils/Makefile.in" - (("^SUBDIRS = doc po") "SUBDIRS =")) - (substitute* "gas/Makefile.in" - (("^SUBDIRS = doc po") "SUBDIRS =")) - (substitute* "gprof/Makefile.in" - (("^SUBDIRS = po") "SUBDIRS =")) - (substitute* "ld/Makefile.in" - (("^SUBDIRS = po") "SUBDIRS ="))))))))) + ,@(%boot-mesboot2-inputs))))) (define (%boot-mesboot3-inputs) `(("binutils" ,binutils-mesboot) -- 2.34.0