From 267b19da593680dad1b9e316eb48c83eb7cde8b7 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Tue, 9 Nov 2021 11:51:39 +0100 Subject: [PATCH] Adapt func_install_blfs.sh to the removal of envars Add to the configuration file in $BUILD_DIR/blfs_root --- common/libs/func_install_blfs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/common/libs/func_install_blfs b/common/libs/func_install_blfs index 092c4f8..e5fa477 100644 --- a/common/libs/func_install_blfs +++ b/common/libs/func_install_blfs @@ -122,9 +122,22 @@ optDependency=2 SUDO=n LANGUAGE=$LANG WRAP_INSTALL=$WRAP_INSTALL +PACK_INSTALL=/blfs_root/packInstall.sh DEL_LA_FILES=$DEL_LA_FILES STATS=n +SRC_ARCHIVE=/sources +BUILD_ROOT=/sources +BUILD_SUBDIRS=y +JOBS=$(if [ -n "$N_PARALLEL" ]; then echo $N_PARALLEL; else echo 1; fi) EOF +for OPT_VAR in CFLAGS CXXFLAGS LDFLAGS; do + eval optVal=\$${OPT_VAR}_$DEF_OPT_MODE + if [ -n "$optVal" ] && [ "$optVal" != unset ]; then + echo "CFG_$OPT_VAR"=\"$optVal\" >> $BUILDDIR$BLFS_ROOT/configuration + else + echo "CFG_$OPT_VAR"=EMPTY >> $BUILDDIR$BLFS_ROOT/configuration + fi +done # Generates the scripts for the blfs tools dependencies (in ./scripts) yes "yes" | $BUILDDIR$BLFS_ROOT/gen_pkg_book.sh $BUILDDIR$BLFS_ROOT