diff --git a/build.sh b/build.sh index a926f5d..5c91944 100755 --- a/build.sh +++ b/build.sh @@ -618,6 +618,53 @@ if [ ! -f "$STEPS_DIR/zlib" ]; then touch "$STEPS_DIR/zlib" fi +# build libxcrypt +if [ ! -f "$STEPS_DIR/libxcrypt" ]; then + if [ ! -d "$LFS_BUILD/libxcrypt" ]; then + tar -xf "$BASE_DIR/sources/libxcrypt-4.4.36.tar.xz" + mv "libxcrypt-4.4.36" "$LFS_BUILD/libxcrypt" + fi + cd "$LFS_BUILD/libxcrypt" + + mkdir -vp build-$LFS_TGT + cd build-$LFS_TGT + + "../configure" \ + --prefix=/usr \ + --disable-static \ + --enable-hashes=strong,glibc \ + --with-sysroot=${LFS} \ + --host=${LFS_TGT} \ + --build=${BUILD_MACHINE_TRIPLET} \ + --enable-obsolete-api=no \ + --disable-failure-tokens \ + --cache-file=config.cache + + make -j 32 + make -j 32 DESTDIR=$LFS install + + #cd .. + #mkdir -vp build-compat-$LFS_TGT + #cd build-compat-$LFS_TGT + + #"../configure" \ + # --prefix=/usr \ + # --disable-static \ + # --enable-hashes=strong,glibc \ + # --with-sysroot=${LFS} \ + # --host=${LFS_TGT} \ + # --build=${BUILD_MACHINE_TRIPLET} \ + # --enable-obsolete-api=glibc \ + # --disable-failure-tokens \ + # --cache-file=config.cache + + # DO NOT MAKE: check archlinux package! + + cd "$BASE_DIR" + rm -rf "$LFS_BUILD/libxcrypt" + touch "$STEPS_DIR/libxcrypt" +fi + # build ncurses # TODO: fix symlink!!! if [ ! -f "$STEPS_DIR/ncurses" ]; then @@ -641,6 +688,7 @@ if [ ! -f "$STEPS_DIR/ncurses" ]; then --sbindir=/usr/bin \ --disable-stripping \ --with-shared \ + --without-normal \ --host=${LFS_TGT} \ --build=${BUILD_MACHINE_TRIPLET} \ --without-debug \ @@ -651,7 +699,8 @@ if [ ! -f "$STEPS_DIR/ncurses" ]; then --disable-root-access \ --without-ada \ --enable-overwrite \ - --with-build-cc=gcc + --with-build-cc=gcc \ + --with-pkg-config-libdir=/usr/lib/pkgconfig make -j 32