mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-15 00:52:07 +03:00
minimal-bootstrap.gnused: replace glibc with musl
This commit is contained in:
parent
198f108a4b
commit
477a60351c
@ -108,14 +108,13 @@ lib.makeScope
|
||||
|
||||
gnused = callPackage ./gnused {
|
||||
bash = bash_2_05;
|
||||
gcc = gcc2;
|
||||
glibc = glibc22;
|
||||
tinycc = tinycc-musl;
|
||||
musl = musl11;
|
||||
gnused = gnused-mes;
|
||||
};
|
||||
gnused-mes = callPackage ./gnused {
|
||||
gnused-mes = callPackage ./gnused/mes.nix {
|
||||
bash = bash_2_05;
|
||||
tinycc = tinycc-mes;
|
||||
mesBootstrap = true;
|
||||
};
|
||||
|
||||
gnutar = callPackage ./gnutar {
|
||||
|
12
pkgs/os-specific/linux/minimal-bootstrap/gnused/common.nix
Normal file
12
pkgs/os-specific/linux/minimal-bootstrap/gnused/common.nix
Normal file
@ -0,0 +1,12 @@
|
||||
{ lib }:
|
||||
|
||||
{
|
||||
meta = with lib; {
|
||||
description = "GNU sed, a batch stream editor";
|
||||
homepage = "https://www.gnu.org/software/sed";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = teams.minimal-bootstrap.members;
|
||||
mainProgram = "sed";
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
@ -4,41 +4,35 @@
|
||||
, fetchurl
|
||||
, bash
|
||||
, gnumake
|
||||
, mesBootstrap ? false, tinycc ? null
|
||||
, gcc ? null, glibc ? null, binutils ? null, gnused ? null, linux-headers, gnugrep
|
||||
, tinycc
|
||||
, musl
|
||||
, gnused
|
||||
, gnugrep
|
||||
, gnutar
|
||||
, gzip
|
||||
}:
|
||||
assert mesBootstrap -> tinycc != null;
|
||||
assert !mesBootstrap -> gcc != null && glibc != null && binutils != null && gnused != null;
|
||||
|
||||
let
|
||||
pname = "gnused" + lib.optionalString mesBootstrap "-mes";
|
||||
# last version that can be compiled with mes-libc
|
||||
version = "4.0.9";
|
||||
inherit (import ./common.nix { inherit lib; }) meta;
|
||||
pname = "gnused";
|
||||
# last version that can be bootstrapped with our slightly buggy gnused-mes
|
||||
version = "4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/sed/sed-${version}.tar.gz";
|
||||
sha256 = "0006gk1dw2582xsvgx6y6rzs9zw8b36rhafjwm288zqqji3qfrf3";
|
||||
};
|
||||
|
||||
# Thanks to the live-bootstrap project!
|
||||
# See https://github.com/fosslinux/live-bootstrap/blob/1bc4296091c51f53a5598050c8956d16e945b0f5/sysa/sed-4.0.9/sed-4.0.9.kaem
|
||||
makefile = fetchurl {
|
||||
url = "https://github.com/fosslinux/live-bootstrap/raw/1bc4296091c51f53a5598050c8956d16e945b0f5/sysa/sed-4.0.9/mk/main.mk";
|
||||
sha256 = "0w1f5ri0g5zla31m6l6xyzbqwdvandqfnzrsw90dd6ak126w3mya";
|
||||
hash = "sha256-20XNY/0BDmUFN9ZdXfznaJplJ0UjZgbl5ceCk3Jn2YM=";
|
||||
};
|
||||
in
|
||||
bash.runCommand "${pname}-${version}" {
|
||||
inherit pname version;
|
||||
inherit pname version meta;
|
||||
|
||||
nativeBuildInputs = [
|
||||
gnumake
|
||||
] ++ lib.optionals mesBootstrap [
|
||||
tinycc.compiler
|
||||
] ++ lib.optionals (!mesBootstrap) [
|
||||
gcc
|
||||
glibc
|
||||
binutils
|
||||
gnused
|
||||
gnugrep
|
||||
gnutar
|
||||
gzip
|
||||
];
|
||||
|
||||
passthru.tests.get-version = result:
|
||||
@ -46,51 +40,25 @@ bash.runCommand "${pname}-${version}" {
|
||||
${result}/bin/sed --version
|
||||
mkdir ''${out}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "GNU sed, a batch stream editor";
|
||||
homepage = "https://www.gnu.org/software/sed";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = teams.minimal-bootstrap.members;
|
||||
mainProgram = "sed";
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
} (''
|
||||
# Unpack
|
||||
ungz --file ${src} --output sed.tar
|
||||
untar --file sed.tar
|
||||
rm sed.tar
|
||||
tar xzf ${src}
|
||||
cd sed-${version}
|
||||
|
||||
'' + lib.optionalString mesBootstrap ''
|
||||
# Configure
|
||||
cp ${makefile} Makefile
|
||||
catm config.h
|
||||
|
||||
# Build
|
||||
make \
|
||||
CC="tcc -B ${tinycc.libs}/lib" \
|
||||
LIBC=mes
|
||||
|
||||
'' + lib.optionalString (!mesBootstrap) ''
|
||||
# Configure
|
||||
export CC="gcc -I${glibc}/include -I${linux-headers}/include"
|
||||
export LIBRARY_PATH="${glibc}/lib"
|
||||
export LIBS="-lc -lnss_files -lnss_dns -lresolv"
|
||||
chmod +x configure
|
||||
export CC="tcc -B ${musl}/lib"
|
||||
export LD=tcc
|
||||
./configure \
|
||||
--build=${buildPlatform.config} \
|
||||
--host=${hostPlatform.config} \
|
||||
--disable-shared \
|
||||
--disable-nls \
|
||||
--disable-dependency-tracking \
|
||||
--without-included-regex \
|
||||
--prefix=$out
|
||||
|
||||
# Build
|
||||
make
|
||||
make AR="tcc -ar"
|
||||
|
||||
'' + ''
|
||||
# Install
|
||||
make install PREFIX=$out
|
||||
make install
|
||||
'')
|
||||
|
59
pkgs/os-specific/linux/minimal-bootstrap/gnused/mes.nix
Normal file
59
pkgs/os-specific/linux/minimal-bootstrap/gnused/mes.nix
Normal file
@ -0,0 +1,59 @@
|
||||
{ lib
|
||||
, buildPlatform
|
||||
, hostPlatform
|
||||
, fetchurl
|
||||
, bash
|
||||
, gnumake
|
||||
, tinycc
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (import ./common.nix { inherit lib; }) meta;
|
||||
pname = "gnused-mes";
|
||||
# last version that can be compiled with mes-libc
|
||||
version = "4.0.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/sed/sed-${version}.tar.gz";
|
||||
sha256 = "0006gk1dw2582xsvgx6y6rzs9zw8b36rhafjwm288zqqji3qfrf3";
|
||||
};
|
||||
|
||||
# Thanks to the live-bootstrap project!
|
||||
# See https://github.com/fosslinux/live-bootstrap/blob/1bc4296091c51f53a5598050c8956d16e945b0f5/sysa/sed-4.0.9/sed-4.0.9.kaem
|
||||
makefile = fetchurl {
|
||||
url = "https://github.com/fosslinux/live-bootstrap/raw/1bc4296091c51f53a5598050c8956d16e945b0f5/sysa/sed-4.0.9/mk/main.mk";
|
||||
sha256 = "0w1f5ri0g5zla31m6l6xyzbqwdvandqfnzrsw90dd6ak126w3mya";
|
||||
};
|
||||
in
|
||||
bash.runCommand "${pname}-${version}" {
|
||||
inherit pname version meta;
|
||||
|
||||
nativeBuildInputs = [
|
||||
gnumake
|
||||
tinycc.compiler
|
||||
];
|
||||
|
||||
passthru.tests.get-version = result:
|
||||
bash.runCommand "${pname}-get-version-${version}" {} ''
|
||||
${result}/bin/sed --version
|
||||
mkdir ''${out}
|
||||
'';
|
||||
} (''
|
||||
# Unpack
|
||||
ungz --file ${src} --output sed.tar
|
||||
untar --file sed.tar
|
||||
rm sed.tar
|
||||
cd sed-${version}
|
||||
|
||||
# Configure
|
||||
cp ${makefile} Makefile
|
||||
catm config.h
|
||||
|
||||
# Build
|
||||
make \
|
||||
CC="tcc -B ${tinycc.libs}/lib" \
|
||||
LIBC=mes
|
||||
|
||||
# Install
|
||||
make install PREFIX=$out
|
||||
'')
|
Loading…
Reference in New Issue
Block a user