zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

port last of HLFS fixes to 1.0

Browse source
This commit is contained in:
George Boudreau 2006-08-01 21:31:32 +00:00
parent d82b9352f0
commit 0a3f3d7a27
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
HLFS/master.sh
View file

@ -247,8 +247,6 @@ chapter5_Makefiles() { # Bootstrap or temptools phase
if [ "$pkg_tarball" != "" ] ; then if [ "$pkg_tarball" != "" ] ; then
# Insert instructions for unpacking the package and to set the PKGDIR variable. # Insert instructions for unpacking the package and to set the PKGDIR variable.
wrt_Unpack_SetOwner "hlfs" "$pkg_tarball" wrt_Unpack_SetOwner "hlfs" "$pkg_tarball"
# If the testsuites must be run, initialize the log file
[[ "$TEST" = "3" ]] && wrt_test_log "${this_script}"
# If using optimizations, write the instructions # If using optimizations, write the instructions
[[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags "$name" [[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags "$name"
fi fi
@ -353,7 +351,7 @@ chapter6_Makefiles() { # sysroot or chroot build phase
# Drop in the name of the target on a new line, and the previous target # Drop in the name of the target on a new line, and the previous target
# as a dependency. Also call the echo_message function. # as a dependency. Also call the echo_message function.
if [[ ${name} = "butterfly-toolchain" ]]; then if [[ ${name} = "butterfly-toolchain" ]]; then
wrt_target "$this_script" "$PREV" wrt_target "${this_script}${N}" "$PREV"
process_toolchain "${this_script}" "${file}" process_toolchain "${this_script}" "${file}"
wrt_touch wrt_touch
PREV=$this_script PREV=$this_script
@ -367,12 +365,11 @@ chapter6_Makefiles() { # sysroot or chroot build phase
if [ "$pkg_tarball" != "" ] ; then if [ "$pkg_tarball" != "" ] ; then
wrt_unpack2 "$pkg_tarball" wrt_unpack2 "$pkg_tarball"
# If the testsuites must be run, initialize the log file # If the testsuites must be run, initialize the log file
# butterfly-toolchain tests are enabled in 'process_tookchain' function
case $name in case $name in
glibc ) glibc ) [[ "$TEST" != "0" ]] && wrt_test_log2 "${this_script}"
[[ "$TEST" != "0" ]] && wrt_test_log2 "${this_script}"
;; ;;
* ) * ) [[ "$TEST" = "2" ]] && [[ "$TEST" = "3" ]] && wrt_test_log2 "${this_script}"
[[ "$TEST" = "2" ]] || [[ "$TEST" = "3" ]] && wrt_test_log2 "${this_script}"
;; ;;
esac esac
# If using optimizations, write the instructions # If using optimizations, write the instructions