Merge remote-tracking branch 'pder/coreutils' into gcc
This commit is contained in:
commit
e30b56cb3e
|
@ -19,7 +19,7 @@ e20bdd49a0fb317959b410c1fe81269a620ec21207045d8a37cadea621be4b59 binutils-2.14.
|
|||
7007fc89c216fbfaff5525359b02a7e5b612694df5168c74673f67055f015095 bison-3.4.1.tar.gz
|
||||
ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269 bzip2-1.0.8.tar.gz
|
||||
c25b36b8af6e0ad2a875daf4d6196bd0df28a62be7dd252e5f99a4d5d7288d95 coreutils-5.0.tar.bz2
|
||||
8815a918867a14dcfeb623786b3a7f7483a039a78dd5a94e9b562667684c07a1 coreutils-6.3.tar.bz2
|
||||
1d013547889f20576460249c4210632d5314531c8477378a2e046b13a8ebeb7e coreutils-6.10.tar.gz
|
||||
d5f2489c4056a31528e3ada4adacc23d498532b0af1a980f2f76158162b139d6 diffutils-2.7.tar.gz
|
||||
bc79b890f35ca38d66ff89a6e3758226131e51ccbd10ef78d5ff150b7bd73689 flex-2.5.11.tar.gz
|
||||
e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995 flex-2.6.4.tar.gz
|
||||
|
|
|
@ -304,13 +304,14 @@ coreutils 5.0
|
|||
=============
|
||||
|
||||
``coreutils`` is rebuilt against musl. Additional utilities are built
|
||||
including ``comm``, ``expr``, ``date``, ``dd``, ``sort``, ``uname`` and
|
||||
including ``comm``, ``expr``, ``dd``, ``sort``, ``sync``, ``uname`` and
|
||||
``uniq``. This fixes a variety of issues with existing ``coreutils``.
|
||||
|
||||
coreutils 6.3
|
||||
coreutils 6.10
|
||||
=============
|
||||
We build ``sha256sum`` from coreutils 6.3 since it is absent in 5.0.
|
||||
Other utils are not build at this stage.
|
||||
We build ``date``, ``mktemp`` and ``sha256sum`` from coreutils 6.10 which are
|
||||
either missing or don't build correctly in 5.0. Other utils are not built at
|
||||
this stage.
|
||||
|
||||
gawk 3.0.4
|
||||
==========
|
||||
|
|
|
@ -183,8 +183,8 @@ get_file https://ftp.gnu.org/gnu/grep/grep-2.4.tar.gz
|
|||
# diffutils 2.7
|
||||
get_file https://ftp.gnu.org/gnu/diffutils/diffutils-2.7.tar.gz
|
||||
|
||||
# coreutils 6.3
|
||||
get_file https://ftp.gnu.org/gnu/coreutils/coreutils-6.3.tar.bz2
|
||||
# coreutils 6.10
|
||||
get_file https://ftp.gnu.org/gnu/coreutils/coreutils-6.10.tar.gz
|
||||
|
||||
# gawk 3.0.4
|
||||
get_file https://ftp.gnu.org/gnu/gawk/gawk-3.0.4.tar.gz
|
||||
|
|
|
@ -38,6 +38,7 @@ fa7ff4f943ca592c623e41a303e697114a420c0a3e5d91c779dfd57ab39b7053 /after/bin/pwd
|
|||
4b7609bd5da6de314b418be80f1be1a525bb4756efb1e9925f0ae7814c6eedef /after/bin/sleep
|
||||
c40dac27f90c5f793a1ed37e78bd1015e44688dc2179da209b1065d02ed0c6e3 /after/bin/sort
|
||||
5087a0f86f238062a85f2f6ca3e6b33ba6b3c8dd9700e314c1ae3b2af3331409 /after/bin/split
|
||||
533d8a75e4460e37714c50eed989a643dffe08e3ab4f7400b966f2241e28a60f /after/bin/sync
|
||||
35f681f7cc31a895f5c5e0db8b6a3c203b2ed9ce1771503f198614302e42c600 /after/bin/sum
|
||||
7272d4fb3313ad3e19c79393d8785d4b343a915e605332eebbc8f5ac5338e071 /after/bin/tail
|
||||
c2c6fae2cad8e29a75ff3f793ca7d059cc50ea4ee7d55f659e8f2d371f7763d6 /after/bin/tee
|
||||
|
|
|
@ -83,7 +83,7 @@ CFLAGS = -I . -I lib \
|
|||
|
||||
SRC_DIR=src
|
||||
|
||||
COREUTILS = basename cat chmod cksum comm csplit cut dd dirname echo env expand expr factor false fmt fold head id join kill link ln logname mkfifo mkdir mknod nl od paste pathchk printf ptx pwd readlink rmdir seq sleep sort split sum tail tee tr tsort uname unexpand uniq unlink wc whoami test true yes
|
||||
COREUTILS = basename cat chmod cksum comm csplit cut dd dirname echo env expand expr factor false fmt fold head id join kill link ln logname mkfifo mkdir mknod nl od paste pathchk printf ptx pwd readlink rmdir seq sleep sort split sum sync tail tee tr tsort uname unexpand uniq unlink wc whoami test true yes
|
||||
|
||||
BINARIES = $(addprefix $(SRC_DIR)/, $(COREUTILS))
|
||||
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
98124acfaf5cd8c1795d9557455607fb157a514867de5b908a9a3c8d00d88717 /after/bin/date
|
||||
fe8a8a6d39e35ca2d980ac0dfb57204f34c34aa2ec543bc15f93ff80bcbbd38a /after/bin/mktemp
|
||||
40289b9aae91f72a7d44bbc93616dcf2397b60d2532b549d053f3ce9b1040119 /after/bin/sha256sum
|
|
@ -4,10 +4,7 @@
|
|||
|
||||
src_prepare() {
|
||||
default_src_prepare
|
||||
|
||||
cp lib/fnmatch_.h lib/fnmatch.h
|
||||
cp lib/fcntl_.h lib/fcntl.h
|
||||
sed -i 's#@ABSOLUTE_FCNTL_H@#"/after/include/musl/fcntl.h"#' lib/fcntl.h
|
||||
mv lib/fnmatch.in.h lib/fnmatch.h
|
||||
|
||||
# Rebuild bison pre-generated file
|
||||
rm lib/getdate.c
|
File diff suppressed because one or more lines are too long
|
@ -1 +0,0 @@
|
|||
34ec35d9de41dd954802dbcfc7c07697f1e7e3cecedbe32ea16a6da85c3eb260 /after/bin/sha256sum
|
|
@ -57,8 +57,8 @@ build diffutils-2.7
|
|||
# Rebuild coreutils using musl
|
||||
build coreutils-5.0 coreutils-5.0.sh checksums/pass2
|
||||
|
||||
# Build only sha256sum
|
||||
build coreutils-6.3
|
||||
# Build only date, mktemp and sha256sum
|
||||
build coreutils-6.10
|
||||
|
||||
build gawk-3.0.4
|
||||
|
||||
|
|
Loading…
Reference in New Issue