diff --git a/phase1/libstdcpp.sh b/phase1/libstdcpp.sh index 5ffb330..e161c2e 100644 --- a/phase1/libstdcpp.sh +++ b/phase1/libstdcpp.sh @@ -9,8 +9,10 @@ cd build --disable-multilib \ --disable-nls \ --disable-libstdcxx-pch \ - --with-gxx-include-dir=/tools/$LFS_TGT/include/c++/11.2.0 + --with-gxx-include-dir=/tools/$LFS_TGT/include/c++/12.2.0 make make DESTDIR=$LFS install +rm -v $LFS/usr/lib/lib{stdc++,stdc++fs,supc++}.la + diff --git a/phase1/linux_headers.sh b/phase1/linux_headers.sh index 3434ff6..9c87a08 100644 --- a/phase1/linux_headers.sh +++ b/phase1/linux_headers.sh @@ -3,5 +3,5 @@ make mrproper make headers find usr/include -type f ! -name '*.h' -delete -cp -r usr/include $LFS/usr +cp -rv usr/include $LFS/usr diff --git a/phase2/binutils.sh b/phase2/binutils.sh index b5235af..1110cbe 100644 --- a/phase2/binutils.sh +++ b/phase2/binutils.sh @@ -10,9 +10,12 @@ cd build --host=$LFS_TGT \ --disable-nls \ --enable-shared \ + --enable-gprofng=no \ --disable-werror \ --enable-64-bit-bfd make make DESTDIR=$LFS install +rm $LFS/usr/lib/lib{bfd,ctf,ctf-nobfd,opcodes}.{a,la} + diff --git a/phase2/file.sh b/phase2/file.sh index 94e8e99..32d7ea6 100644 --- a/phase2/file.sh +++ b/phase2/file.sh @@ -12,3 +12,5 @@ popd make FILE_COMPILE=$(pwd)/build/src/file make DESTDIR=$LFS install +rm $LFS/usr/lib/libmagic.la + diff --git a/phase2/gcc.sh b/phase2/gcc.sh index dfd11f8..9e98980 100644 --- a/phase2/gcc.sh +++ b/phase2/gcc.sh @@ -18,17 +18,18 @@ case $(uname -m) in ;; esac +sed '/thread_header =/s/@.*@/gthr-posix.h/' \ + -i libgcc/Makefile.in libstdc++-v3/include/Makefile.in + mkdir build cd build -mkdir -p $LFS_TGT/libgcc -ln -s ../../../libgcc/gthr-posix.h $LFS_TGT/libgcc/gthr-default.h - ../configure \ --build=$(../config.guess) \ --host=$LFS_TGT \ + --target=$LFS_TGT \ + LDFLAGS_FOR_TARGET=-L$PWD/$LFS_TGT/libgcc \ --prefix=/usr \ - CC_FOR_TARGET=$LFS_TGT-gcc \ --with-build-sysroot=$LFS \ --enable-initfini-array \ --disable-nls \ @@ -39,7 +40,6 @@ ln -s ../../../libgcc/gthr-posix.h $LFS_TGT/libgcc/gthr-default.h --disable-libquadmath \ --disable-libssp \ --disable-libvtv \ - --disable-libstdcxx \ --enable-languages=c,c++ make diff --git a/phase2/ncurses.sh b/phase2/ncurses.sh index 604eeff..1eb1ff9 100644 --- a/phase2/ncurses.sh +++ b/phase2/ncurses.sh @@ -14,9 +14,10 @@ popd --mandir=/usr/share/man \ --with-manpage-format=normal \ --with-shared \ + --without-normal \ + --with-cxx-shared \ --without-debug \ --without-ada \ - --without-normal \ --disable-stripping \ --enable-widec diff --git a/phase2/xz.sh b/phase2/xz.sh index 5dc5b30..927d3a6 100644 --- a/phase2/xz.sh +++ b/phase2/xz.sh @@ -3,8 +3,10 @@ --host=$LFS_TGT \ --build=$(build-aux/config.guess) \ --disable-static \ - --docdir=/usr/share/doc/xz-5.2.5 + --docdir=/usr/share/doc/xz-5.2.6 make make DESTDIR=$LFS install +rm $LFS/usr/lib/liblzma.la +