diff options
Diffstat (limited to 'chapter6')
| -rw-r--r-- | chapter6/bash.sh | 1 | ||||
| -rw-r--r-- | chapter6/binutils.sh | 1 | ||||
| -rw-r--r-- | chapter6/coreutils.sh | 1 | ||||
| -rw-r--r-- | chapter6/diffutils.sh | 1 | ||||
| -rw-r--r-- | chapter6/file.sh | 5 | ||||
| -rw-r--r-- | chapter6/findutils.sh | 1 | ||||
| -rw-r--r-- | chapter6/gawk.sh | 1 | ||||
| -rw-r--r-- | chapter6/gcc.sh | 9 | ||||
| -rw-r--r-- | chapter6/grep.sh | 1 | ||||
| -rw-r--r-- | chapter6/gzip.sh | 1 | ||||
| -rw-r--r-- | chapter6/m4.sh | 1 | ||||
| -rw-r--r-- | chapter6/make.sh | 1 | ||||
| -rw-r--r-- | chapter6/ncurses.sh | 1 | ||||
| -rw-r--r-- | chapter6/patch.sh | 1 | ||||
| -rw-r--r-- | chapter6/sed.sh | 1 | ||||
| -rw-r--r-- | chapter6/tar.sh | 1 | ||||
| -rw-r--r-- | chapter6/xz.sh | 1 |
17 files changed, 6 insertions, 23 deletions
diff --git a/chapter6/bash.sh b/chapter6/bash.sh index 9251a89..c920026 100644 --- a/chapter6/bash.sh +++ b/chapter6/bash.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e patch -Np1 -i ../bash-"${VERSION}"-fixes-1.patch && ./configure --prefix=/usr \ diff --git a/chapter6/binutils.sh b/chapter6/binutils.sh index 3e4af1d..9b97c4b 100644 --- a/chapter6/binutils.sh +++ b/chapter6/binutils.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e mkdir -v build cd build || exit 1 diff --git a/chapter6/coreutils.sh b/chapter6/coreutils.sh index 5231b45..536fa52 100644 --- a/chapter6/coreutils.sh +++ b/chapter6/coreutils.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --host="${LFS_TGT}" \ diff --git a/chapter6/diffutils.sh b/chapter6/diffutils.sh index 580d795..f6c45af 100644 --- a/chapter6/diffutils.sh +++ b/chapter6/diffutils.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e sed 's/help2man -i/help2man --no-discard-stderr -i /' -i man/Makefile.in HELP2MAN="help2man --no-discard-stderr" ./configure --prefix=/usr \ diff --git a/chapter6/file.sh b/chapter6/file.sh index 69c17d8..bd51747 100644 --- a/chapter6/file.sh +++ b/chapter6/file.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e mkdir build pushd build > /dev/null || exit 1 @@ -15,7 +14,7 @@ popd > /dev/null || exit 1 --host="${LFS_TGT}" \ --build="$(./config.guess)" && make FILE_COMPILE="$(pwd)"/build/src/file && -make DESTDIR="${LFS}" -j1 install +make DESTDIR="${LFS}" -j1 install && -mv -v "${LFS}"/usr/lib/libmagic.so.* "${LFS}"/lib +mv -v "${LFS}"/usr/lib/libmagic.so.* "${LFS}"/lib && ln -sfv ../../lib/"$(readlink /usr/lib/libmagic.so)" "${LFS}"/usr/lib/libmagic.so diff --git a/chapter6/findutils.sh b/chapter6/findutils.sh index 5617c10..0526c41 100644 --- a/chapter6/findutils.sh +++ b/chapter6/findutils.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e # shellcheck disable=SC2016 ./configure --prefix=/usr \ diff --git a/chapter6/gawk.sh b/chapter6/gawk.sh index 1d18cdc..29d7a8b 100644 --- a/chapter6/gawk.sh +++ b/chapter6/gawk.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e sed -i 's/extras//' Makefile.in && ./configure --prefix=/usr \ diff --git a/chapter6/gcc.sh b/chapter6/gcc.sh index 7806d3a..d40a855 100644 --- a/chapter6/gcc.sh +++ b/chapter6/gcc.sh @@ -1,11 +1,10 @@ #!/bin/bash -set -e mkdir -p isl mpfr gmp mpc -tar -xf ../isl-*.tar.xz -C isl --strip-components=1 -tar -xf ../mpfr-*.tar.xz -C mpfr --strip-components=1 -tar -xf ../gmp-*.tar.xz -C gmp --strip-components=1 -tar -xf ../mpc-*.tar.gz -C mpc --strip-components=1 +tar -xf ../isl-*.tar.xz -C isl --strip-components=1 && +tar -xf ../mpfr-*.tar.xz -C mpfr --strip-components=1 && +tar -xf ../gmp-*.tar.xz -C gmp --strip-components=1 && +tar -xf ../mpc-*.tar.gz -C mpc --strip-components=1 && case $(uname -m) in x86_64) diff --git a/chapter6/grep.sh b/chapter6/grep.sh index 7aaa38a..9aab0f4 100644 --- a/chapter6/grep.sh +++ b/chapter6/grep.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --host="${LFS_TGT}" \ diff --git a/chapter6/gzip.sh b/chapter6/gzip.sh index d8a45c7..f894df6 100644 --- a/chapter6/gzip.sh +++ b/chapter6/gzip.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --host="${LFS_TGT}" && diff --git a/chapter6/m4.sh b/chapter6/m4.sh index aeb1024..2f67ebe 100644 --- a/chapter6/m4.sh +++ b/chapter6/m4.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c && echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h && diff --git a/chapter6/make.sh b/chapter6/make.sh index 0b2ace4..4de06b6 100644 --- a/chapter6/make.sh +++ b/chapter6/make.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --without-guile \ diff --git a/chapter6/ncurses.sh b/chapter6/ncurses.sh index 1bf8824..6320a9f 100644 --- a/chapter6/ncurses.sh +++ b/chapter6/ncurses.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e sed -i s/mawk// configure && diff --git a/chapter6/patch.sh b/chapter6/patch.sh index 42add5e..fa1dac9 100644 --- a/chapter6/patch.sh +++ b/chapter6/patch.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --host="${LFS_TGT}" \ diff --git a/chapter6/sed.sh b/chapter6/sed.sh index 7aaa38a..9aab0f4 100644 --- a/chapter6/sed.sh +++ b/chapter6/sed.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --host="${LFS_TGT}" \ diff --git a/chapter6/tar.sh b/chapter6/tar.sh index 28aea9c..730d108 100644 --- a/chapter6/tar.sh +++ b/chapter6/tar.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --host="${LFS_TGT}" \ diff --git a/chapter6/xz.sh b/chapter6/xz.sh index a519ebd..6766de1 100644 --- a/chapter6/xz.sh +++ b/chapter6/xz.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e ./configure --prefix=/usr \ --host="${LFS_TGT}" \ |