Rebuild re-tested

This commit is contained in:
Denis Benato 2024-12-11 23:37:16 +01:00
parent 07db72ac9d
commit 58cd3e9cbf

View file

@ -720,6 +720,43 @@ if [ ! -f "$STEPS_DIR/ncurses" ]; then
--with-manpage-format=normal \ --with-manpage-format=normal \
--disable-stripping \ --disable-stripping \
--with-shared \ --with-shared \
--without-normal \
--host=${LFS_TGT} \
--build=${BUILD_MACHINE_TRIPLET} \
--without-debug \
--enable-pc-files \
--disable-setuid-environ \
--disable-root-environ \
--disable-root-access \
--with-versioned-syms \
--without-ada \
--enable-overwrite \
--with-build-cc=gcc \
--with-pkg-config-libdir=/usr/lib/pkgconfig
make -j 32
make -j 32 DESTDIR="$LFS" install
cd ..
mkdir -vp build-widec-$LFS_TGT
cd build-widec-$LFS_TGT
# --with-cxx-binding no c++?
# --with-cxx-shared no c++?
# --without-normal will make readline error
# --disable-stripping # this must go away
"../configure" \
--prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--libdir=/usr/lib \
--sbindir=/usr/bin \
--mandir=/usr/share/man \
--with-manpage-format=normal \
--disable-stripping \
--with-shared \
--without-normal \
--host=${LFS_TGT} \ --host=${LFS_TGT} \
--build=${BUILD_MACHINE_TRIPLET} \ --build=${BUILD_MACHINE_TRIPLET} \
--without-debug \ --without-debug \
@ -737,26 +774,6 @@ if [ ! -f "$STEPS_DIR/ncurses" ]; then
make -j 32 make -j 32
make -j 32 DESTDIR="$LFS" install make -j 32 DESTDIR="$LFS" install
# fool packages looking to link to non-wide-character ncurses libraries
for lib in ncurses ncurses++ form panel menu; do
if [ -f "$LFS/usr/lib/lib${lib}.so" ]; then
printf "INPUT(-l%sw)\n" "${lib}" > "$LFS/usr/lib/lib${lib}.so"
ln -sv ${lib}w.pc "$LFS/usr/lib/pkgconfig/${lib}.pc"
fi
done
# some packages look for -lcurses during build
printf 'INPUT(-lncursesw)\n' > "$LFS/usr/lib/libcursesw.so"
ln -sv libncurses.so "$LFS/usr/lib/libcurses.so"
# tic and ticinfo functionality is built in by default
# make sure that anything linking against it links against libncursesw.so instead
for lib in tic tinfo; do
#printf "INPUT(libncursesw.so.%s)\n" "${_pkgver:0:1}" > "$LFS/usr/lib/lib${lib}.so"
#ln -sv libncursesw.so.${pkgver:0:1} "$pkgdir/usr/lib/lib${lib}.so.${_pkgver:0:1}"
ln -sv ncursesw.pc "$LFS/usr/lib/pkgconfig/${lib}.pc"
done
cd "$BASE_DIR" cd "$BASE_DIR"
rm -rf "$LFS_BUILD/ncurses" rm -rf "$LFS_BUILD/ncurses"
touch "$STEPS_DIR/ncurses" touch "$STEPS_DIR/ncurses"
@ -775,7 +792,6 @@ if [ ! -f "$STEPS_DIR/readline" ]; then
# --with-curses \ # --with-curses \
"../configure" \ "../configure" \
--with-sysroot=${LFS} \
--host=${LFS_TGT} \ --host=${LFS_TGT} \
--build=${BUILD_MACHINE_TRIPLET} \ --build=${BUILD_MACHINE_TRIPLET} \
--prefix=/usr \ --prefix=/usr \