From: Timothy Sample <samplet@ngyro.com>
To: 54394@debbugs.gnu.org
Cc: Timothy Sample <samplet@ngyro.com>
Subject: [bug#54394] [PATCH core-updates 08/12] gnu: bzip2-mesboot: Remove package.
Date: Mon, 14 Mar 2022 16:57:07 -0600 [thread overview]
Message-ID: <20220314225712.19869-8-samplet@ngyro.com> (raw)
In-Reply-To: <87v8wg40dl.fsf@ngyro.com>
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)
--
2.34.0
next prev parent reply other threads:[~2022-03-14 22:59 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-14 22:47 [bug#54394] [PATCH core-updates 00/12] Remove old GNU utilities from early bootstrap Timothy Sample
2022-03-14 22:57 ` [bug#54394] [PATCH core-updates 01/12] gnu: hello-mesboot: Downgrade to 2.10 Timothy Sample
2022-03-16 17:25 ` [bug#54394] [PATCH core-updates 00/12] Remove old GNU utilities from early bootstrap Ludovic Courtès
2022-03-14 22:57 ` [bug#54394] [PATCH core-updates 02/12] gnu-bootstrap: Configure PACKAGE_NAME Timothy Sample
2022-03-14 22:57 ` [bug#54394] [PATCH core-updates 03/12] gnu-bootstrap: Allow multiple module directories Timothy Sample
2022-03-14 22:57 ` [bug#54394] [PATCH core-updates 04/12] gnu: gash-utils: Update to 0.2.0 Timothy Sample
2022-03-14 22:57 ` [bug#54394] [PATCH core-updates 05/12] gnu: bootar: Update to 1b Timothy Sample
2022-03-14 22:57 ` [bug#54394] [PATCH core-updates 06/12] gnu: gash: Update to 0.3.0 Timothy Sample
2022-03-14 22:57 ` [bug#54394] [PATCH core-updates 07/12] gnu: gash-utils-boot: Create 'echo' wrapper Timothy Sample
2022-03-14 22:57 ` Timothy Sample [this message]
2022-03-14 22:57 ` [bug#54394] [PATCH core-updates 09/12] gnu: sed-mesboot0: Remove package Timothy Sample
2022-03-14 22:57 ` [bug#54394] [PATCH core-updates 10/12] gnu: binutils-mesboot0: Update to 2.20.1a Timothy Sample
2022-03-14 22:57 ` [bug#54394] [PATCH core-updates 11/12] gnu: %boot-tcc-inputs: Remove extra "gash-utils" Timothy Sample
2022-03-14 22:57 ` [bug#54394] [PATCH core-updates 12/12] gnu: commencement: Remove many old utilities Timothy Sample
2022-03-15 10:34 ` Maxime Devos
2022-03-15 19:35 ` Timothy Sample
2022-03-16 17:25 ` [bug#54394] [PATCH core-updates 00/12] Remove old GNU utilities from early bootstrap Ludovic Courtès
2022-03-16 17:32 ` Ludovic Courtès
2022-03-19 19:53 ` bug#54394: " Timothy Sample
2022-03-21 15:17 ` [bug#54394] " Ludovic Courtès
2022-03-20 11:38 ` Jan Nieuwenhuizen
2022-03-20 11:48 ` Jan Nieuwenhuizen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220314225712.19869-8-samplet@ngyro.com \
--to=samplet@ngyro.com \
--cc=54394@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.