Improved fpkg and now chwcking integrity of bz2 archives

[hvlinux.git] / stage1 / cis-bash

diff --git a/stage1/cis-bash b/stage1/cis-bash
index a8a4edb..4aa5816 100755 (executable)
--- a/stage1/cis-bash
+++ b/stage1/cis-bash
@@ -1,4 +1,12 @@
 #!/bin/sh
+set -o errexit
+
+# First argument of this script is the package name.
+# Remaining arguments are additional configure options.
+
+PACKAGE=${1}
+shift
+CONFIGURE_OPTS=${*}
 
 # Reading system configuration informations, functions and package versions.
 source ../sysinfos
@@ -6,15 +14,33 @@ source ../functions
 source ../packages-list
 
 # Applying patches (if any)
-apply_patches ${1} &&
+apply_patches ${PACKAGE}
+
+cd ${LFS_TMP}/${PACKAGE}-build
+
+# When Bash is cross-compiled, it cannot test for the presence of named pipes,
+# among other things. If you used su to become an unprivileged user, this
+# combination will cause Bash to build without process substitution, which
+# will break one of the C++ test scripts in eglibc. The following prevents
+# future problems by skipping the check for named pipes, as well as other tests
+# that can not run while cross-compiling or that do not run properly:
+cat > config.cache << "EOF"
+ac_cv_func_mmap_fixed_mapped=yes
+ac_cv_func_strcoll_works=yes
+ac_cv_func_working_mktime=yes
+bash_cv_func_sigsetjmp=present
+bash_cv_getcwd_malloc=yes
+bash_cv_job_control_missing=present
+bash_cv_printf_a_format=yes
+bash_cv_sys_named_pipes=present
+bash_cv_ulimit_maxfds=yes
+bash_cv_under_sys_siglist=yes
+bash_cv_unusable_rtsigs=no
+gt_cv_int_divbyzero_sigfpe=yes
+EOF
+
+${SCRDIR}/cis-common ${PACKAGE} "${CONFIGURE_OPTS} --without-bash-malloc --cache-file=config.cache"
 
-cd ${LFS_TMP}/${1}-build &&
-../${1}/configure \
-    --prefix=/tools \
-    --without-bash-malloc &&
-make -j ${MAKEJOBS} &&
-make install &&
-ln -sf bash /tools/bin/sh
+ln -svfT bash /tools/bin/sh
 
-# Return last error
 exit $?