From patchwork Mon Mar 14 22:57:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timothy Sample X-Patchwork-Id: 37828 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 60AA227BBEA; Mon, 14 Mar 2022 22:59:28 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 D848227BBE9 for ; Mon, 14 Mar 2022 22:59:27 +0000 (GMT) Received: from localhost ([::1]:55350 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nTtex-0001Q9-1y for patchwork@mira.cbaines.net; Mon, 14 Mar 2022 18:59:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45136) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nTteZ-0000cb-Jq for guix-patches@gnu.org; Mon, 14 Mar 2022 18:59:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53018) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nTteZ-00054x-BJ for guix-patches@gnu.org; Mon, 14 Mar 2022 18:59:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nTteZ-00056q-Ap for guix-patches@gnu.org; Mon, 14 Mar 2022 18:59:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54394] [PATCH core-updates 08/12] gnu: bzip2-mesboot: Remove package. Resent-From: Timothy Sample Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Mar 2022 22:59:03 +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.164729870219508 (code B ref 54394); Mon, 14 Mar 2022 22:59:03 +0000 Received: (at 54394) by debbugs.gnu.org; 14 Mar 2022 22:58:22 +0000 Received: from localhost ([127.0.0.1]:46895 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTtdt-00054Y-NV for submit@debbugs.gnu.org; Mon, 14 Mar 2022 18:58:21 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:52857) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTtdt-000549-7J for 54394@debbugs.gnu.org; Mon, 14 Mar 2022 18:58:21 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 0FD615C0262; Mon, 14 Mar 2022 18:58:16 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 14 Mar 2022 18:58:16 -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=wcYRGU 6nce503P6eSY89HRJ3K1YicvmmFnPid1rNSyQ=; b=CA9DQZfWIYj0xBgaak7UxT tjl8folKMEjrTxti9VdAfJ5oQlXZ5vv2KvYBHTMbPSAe02h5kB/YSdrIFqX5/fYZ JpK+lzBDwqg9P/FQq1jTMEQQVxsjqNJxGaSPYdMe3nz8PFAebscgqUoOGVL2Qbxj lQ0MV2SNQzObpLTBWj5DePRpHBnsFd80w9Q+sTOY2gXjHolPGkLDbDIQQREmJsX9 gQsBgQPkTomPdsHNqxQ1vg3XapkaMoKX+9/SNaQI/ldsYQX/zoo+atPNK2jpgTG3 wO7M8y0A8/tu0W4DV/+rs953wWPK3aPAiBLMG33x1OQ04v3tC4dha8HYdvWH7FXA == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddruddvledgtddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepvfhimhhothhhhicuufgrmhhplhgvuceoshgrmhhplhgvthes nhhghihrohdrtghomheqnecuggftrfgrthhtvghrnheptdevieffudevieeitdehieevie ethfegveelgeetveehvdffiedvffduuddukedunecuvehluhhsthgvrhfuihiivgepuden ucfrrghrrghmpehmrghilhhfrhhomhepshgrmhhplhgvthesnhhghihrohdrtghomh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 14 Mar 2022 18:58:15 -0400 (EDT) From: Timothy Sample Date: Mon, 14 Mar 2022 16:57:07 -0600 Message-Id: <20220314225712.19869-8-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 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 (bzip2-mesboot): Remove variable. (tcc-boot)[native-inputs]: Remove 'bzip2-mesboot'. [arguments]: Do not replace the 'unpack' phase. (%boot-tcc-inputs): Remove 'bzip2-mesboot'. --- gnu/packages/commencement.scm | 60 +---------------------------------- 1 file changed, 1 insertion(+), 59 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index df91f57b59..d0bac512a3 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -662,54 +662,6 @@ (define (%boot-tcc0-inputs) ("tcc" ,tcc-boot0) ,@(%boot-gash-inputs))) -(define bzip2-mesboot - ;; The initial bzip2 - (package - (inherit bzip2) - (name "bzip2-mesboot") - (version (package-version bzip2)) - (source (bootstrap-origin (package-source bzip2))) - (supported-systems '("i686-linux" "x86_64-linux")) - (inputs '()) - (propagated-inputs '()) - (native-inputs (%boot-tcc0-inputs)) - (outputs '("out")) - (arguments - `(#:implicit-inputs? #f - #:guile ,%bootstrap-guile - #:parallel-build? #f - #:tests? #f ; check is naive, also checks non-built PROGRAMS - #:strip-binaries? #f ; no strip yet - #:make-flags (list "CC=tcc -I ." "AR=tcc -ar" "bzip2" - (string-append "PREFIX=" - (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'scripted-patch - (lambda _ - (substitute* "Makefile" - (("\tln " all) - (string-append "\t#" all))) - (substitute* "bzip2.c" - (("struct utimbuf uTimBuf;" all) - (string-append "// " all)) - (("uTimBuf[.]" all) - (string-append "// " all)) - (("retVal = utime [(] dstName, &uTimBuf [)];" all) - (string-append "retVal = 0; // " all))))) - (replace 'configure - (lambda _ - (with-output-to-file "utime.h" - (lambda _ (display " -#define fchown(filedes, owner, group) 0 -#define fchmod(filedes, mode) 0 -"))))) - (replace 'check - (lambda _ - (invoke "./bzip2" "--help"))) - ;; FIXME: no compressing gzip yet - (delete 'compress-documentation)))))) - (define bash-mesboot0 ;; The initial Bash (package @@ -818,8 +770,7 @@ (define tcc-boot (build-system gnu-build-system) (inputs '()) (propagated-inputs '()) - (native-inputs `(("bzip2" ,bzip2-mesboot) - ,@(%boot-tcc0-inputs))) + (native-inputs (%boot-tcc0-inputs)) (arguments `(#:implicit-inputs? #f #:guile ,%bootstrap-guile @@ -827,14 +778,6 @@ (define tcc-boot #:strip-binaries? #f ; no strip yet #:phases (modify-phases %standard-phases - ;; tar xvf ..bz2 gives - ;; bzip2: PANIC -- internal consistency error - (replace 'unpack - (lambda* (#:key source #:allow-other-keys) - (copy-file source "tarball.tar.bz2") - (invoke "bzip2" "-d" "tarball.tar.bz2") - (invoke "tar" "xvf" "tarball.tar") - (chdir (string-append "tcc-" ,version)))) (add-after 'unpack 'scripted-patch (lambda* (#:key inputs #:allow-other-keys) (substitute* "libtcc.c" @@ -982,7 +925,6 @@ (define sed-mesboot0 (define (%boot-tcc-inputs) `(("bash" ,bash-mesboot0) - ("bzip2" ,bzip2-mesboot) ("gzip" ,gzip-mesboot) ("patch" ,patch-mesboot) ("sed" ,sed-mesboot0)