From b4ef2bb4ace19e63aeeccbbdd4aef4785547e95d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Mon, 11 May 2026 15:03:16 +0900 Subject: [PATCH] gnu: Remove musl-cross. * gnu/packages/heads.scm (musl-cross): Delete variable. Change-Id: I8de2a5f025f95d035377031d15c7b0d26ff1438e Closes: https://codeberg.org/guix/guix/issues/6504 --- gnu/packages/heads.scm | 117 ----------------------------------------- 1 file changed, 117 deletions(-) diff --git a/gnu/packages/heads.scm b/gnu/packages/heads.scm index a176253122d..29240aadb17 100644 --- a/gnu/packages/heads.scm +++ b/gnu/packages/heads.scm @@ -49,123 +49,6 @@ #:use-module ((guix build utils) #:select (alist-replace)) #:use-module (srfi srfi-1)) -(define-public musl-cross - (let ((revision "3") - (commit "a8a66490dae7f23a2cf5e256f3a596d1ccfe1a03")) - (package - (name "musl-cross") - (version (git-version "0.1" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/GregorR/musl-cross") - (commit commit))) - (file-name "musl-cross-checkout") - (sha256 - (base32 - "1xvl9y017wb2qaphy9zqh3vrhm8hklr8acvzzcjc35d1jjhyl58y")) - (patches (search-patches "musl-cross-locale.patch")))) - (build-system gnu-build-system) - (arguments - `(#:tests? #f ; No tests in main project. - #:modules - ((guix build utils) - (guix build gnu-build-system) - (srfi srfi-1)) ; drop - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda _ - (setenv "SHELL" "bash") - (setenv "CONFIG_SHELL" "bash") - #t)) - (add-after 'unpack 'unpack-dependencies - (lambda* (#:key inputs outputs #:allow-other-keys) - (define (install-file* source-key destination-directory - destination-suffix) - (let* ((source-file (assoc-ref inputs source-key)) - (source-basename (basename source-file)) - (source-parts (string-split source-basename #\-)) - (destination-file - (string-join (drop source-parts 1) "-"))) - (copy-file source-file - (string-append destination-directory "/" - destination-file destination-suffix)))) - (for-each (lambda (name) - (install-file* name "tarballs" "")) - '("binutils" "target-gcc-5" "linux-headers" "musl")) - (copy-file (string-append (assoc-ref inputs "config.sub") - "/share/automake-1.16/config.sub") - "tarballs/config.sub;hb=3d5db9ebe860") - (copy-file (string-append (assoc-ref inputs "config.sub") - "/share/automake-1.16/config.guess") - "tarballs/config.guess;hb=3d5db9ebe860") - (substitute* "config.sh" - (("^CC_BASE_PREFIX=.*") - (string-append "CC_BASE_PREFIX=" (assoc-ref outputs "out") - "/crossgcc\n"))) - ;; Note: Important: source/gcc-5.3.0/gcc/exec-tool.in - ;; Note: Important: source/kernel-headers-3.12.6-5/tools/install.sh - ;; Note: Important: move-if-change (twice) - ;; Make sure that shebangs are patched after new extractions. - (substitute* "defs.sh" - (("touch \"[$]2/extracted\"") - (string-append "touch \"$2/extracted\" -for s in mkinstalldirs move-if-change compile depcomp callprocs configure \\ -mkdep compile libtool-ldflags config.guess install-sh missing config.sub \\ -config.rpath progtest.m4 lib-ld.m4 acx.m4 gen-fixed.sh mkheader.sh ylwrap \\ -merge.sh godeps.sh lock-and-run.sh print-sysroot-suffix.sh mkconfig.sh \\ -genmultilib exec-tool.in install.sh -do - find . -name $s -exec sed -i -e 's;!/bin/sh;!" (assoc-ref inputs "bash") -"/bin/sh;' '{}' ';' - find . -name $s -exec sed -i -e 's; /bin/sh; " (assoc-ref inputs "bash") -"/bin/sh;' '{}' ';' -done -" ))) - #t)) - (replace 'build - (lambda* (#:key outputs #:allow-other-keys) - (invoke "./build.sh"))) - (delete 'install)))) - (native-inputs - `(("config.sub" ,automake) - ("bash" ,bash) - ("flex" ,flex) - ("gmp" ,gmp) - ("mpfr" ,mpfr) - ("mpc" ,mpc) - ("binutils" - ,(origin - (method url-fetch) - (uri "https://ftpmirror.gnu.org/gnu/binutils/binutils-2.27.tar.bz2") - (sha256 - (base32 "125clslv17xh1sab74343fg6v31msavpmaa1c1394zsqa773g5rn")))) - ("target-gcc-5" - ,(origin - (method url-fetch) - (uri "https://ftpmirror.gnu.org/gnu/gcc/gcc-5.3.0/gcc-5.3.0.tar.bz2") - (sha256 - (base32 "1ny4smkp5bzs3cp8ss7pl6lk8yss0d9m4av1mvdp72r1x695akxq")))) - ("linux-headers" - ,(origin - (method url-fetch) - (uri "http://ftp.barfooze.de/pub/sabotage/tarballs/linux-headers-4.19.88.tar.xz") - (sha256 - (base32 "1srgi2nqw892jb6yd4kzacf2xzwfvzhsv2957xfh1nvbs7varwyk")))) - ("musl" - ,(origin - (method url-fetch) - (uri "http://www.musl-libc.org/releases/musl-1.1.24.tar.gz") - (sha256 - (base32 "18r2a00k82hz0mqdvgm7crzc7305l36109c0j9yjmkxj2alcjw0k")))))) - (supported-systems (remove target-hurd? %supported-systems)) - (home-page "https://github.com/osresearch/heads") - (synopsis "Cross gcc 5 toolchain") - (description "Musl-cross toolchain: binutils, gcc 5 and musl.") - (license license:isc)))) - ;; This package provides a "dev.cpio" file usable as a base for booting Heads. (define-public heads-dev-cpio (package