M.Canales.es wrote:
><snip>
> I would to merge it to trunk in 2-3 days from now if there is no objetions or
> some propossal about enchancements or additional features.
Here's a MAKEFLAGS patch for the issue brought up earlier. It just
picks out gettext and doesn't add MAKEFLAGS to the environment. Kindof
a hack, but it should work (and I'm not too sure how else to handle it
at the moment without drawing it completely into the optimize code).
This is really a bug that should be fixed by the gettext maintainer(s)
and patched in LFS until then though, no? Sure, the breakage only
surfaces with MAKEFLAGS set, but it's still broken.
Regards,
Jeremy.
diff -Naur jhalfs-2666/CLFS/master.sh jhalfs-2666-makeflags/CLFS/master.sh
--- jhalfs-2666/CLFS/master.sh 2006-05-07 13:51:55.000000000 -0700
+++ jhalfs-2666-makeflags/CLFS/master.sh 2006-05-07 17:02:14.000000000
-0700
@@ -184,7 +184,7 @@
# Insert instructions for unpacking the package and to set the PKGDIR
variable.
#
[[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar.*"
- [[ "$vrs" != "" ]] && [[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" &&
wrt_makeflags
+ [[ "$vrs" != "" ]] && [[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" &&
wrt_makeflags "$name"
#
wrt_run_as_su "${this_script}" "${file}"
#
@@ -256,7 +256,7 @@
# Insert instructions for unpacking the package and changing directories
#
[[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar.*"
- [[ "$vrs" != "" ]] && [[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" &&
wrt_makeflags
+ [[ "$vrs" != "" ]] && [[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" &&
wrt_makeflags "$name"
#
# Select a script execution method
case $this_script in
@@ -327,7 +327,7 @@
*util-linux) wrt_unpack "$name-$vrs.tar.*" ;;
*) wrt_unpack2 "$name-$vrs.tar.*" ;;
esac
- [[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags
+ [[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags "$name"
fi
#
# Select a script execution method
@@ -388,7 +388,7 @@
tcl) wrt_unpack2 "$name$vrs-src.tar.*" ;;
*) wrt_unpack2 "$name-$vrs.tar.*" ;;
esac
- [[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags
+ [[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags "$name"
#
wrt_run_as_chroot1 "${this_script}" "${file}"
#
@@ -443,7 +443,7 @@
tcl) wrt_unpack3 "$name$vrs-src.tar.*" ;;
*) wrt_unpack3 "$name-$vrs.tar.*" ;;
esac
- [[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags
+ [[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags "$name"
#
wrt_run_as_root2 "${this_script}" "${file}"
#
@@ -542,7 +542,7 @@
if [ "$vrs" != "" ] ; then
FILE="$name-$vrs.tar.*"
wrt_unpack2 "$FILE"
- [[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags
+ [[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags
"$name"
fi
#
wrt_run_as_chroot1 "${this_script}" "${file}"
@@ -645,7 +645,7 @@
if [ "$vrs" != "" ] ; then
FILE="$name-$vrs.tar.*"
wrt_unpack3 "$FILE"
- [[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags
+ [[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags
"$name"
fi
#
wrt_run_as_root2 "${this_script}" "${file}"
diff -Naur jhalfs-2666/HLFS/master.sh jhalfs-2666-makeflags/HLFS/master.sh
--- jhalfs-2666/HLFS/master.sh 2006-05-07 13:51:55.000000000 -0700
+++ jhalfs-2666-makeflags/HLFS/master.sh 2006-05-07 16:59:43.000000000
-0700
@@ -142,7 +142,7 @@
esac
# Insert instructions for unpacking the package and to set the PKGDIR
variable.
wrt_unpack "$FILE"
- [[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags
+ [[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags "$name"
fi
case $this_script in
@@ -309,7 +309,7 @@
esac
wrt_unpack2 "$FILE"
wrt_target_vars
- [[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags
+ [[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags
"$name"
fi
case $this_script in
diff -Naur jhalfs-2666/LFS/master.sh jhalfs-2666-makeflags/LFS/master.sh
--- jhalfs-2666/LFS/master.sh 2006-05-07 13:51:54.000000000 -0700
+++ jhalfs-2666-makeflags/LFS/master.sh 2006-05-07 16:59:20.000000000 -0700
@@ -112,7 +112,7 @@
# Insert instructions for unpacking the package and to set the PKGDIR
variable.
wrt_unpack "$FILE"
- [[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags
+ [[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags "$name"
fi
# Insert date and disk usage at the top of the log file, the script run
@@ -216,7 +216,7 @@
if [ "$vrs" != "" ] ; then
FILE="$name-$vrs.tar.*"
wrt_unpack2 "$FILE"
- [[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags
+ [[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags
"$name"
fi
# In the mount of kernel filesystems we need to set LFS
diff -Naur jhalfs-2666/optimize/optimize_functions
jhalfs-2666-makeflags/optimize/optimize_functions
--- jhalfs-2666/optimize/optimize_functions 2006-05-07 13:51:54.000000000
-0700
+++ jhalfs-2666-makeflags/optimize/optimize_functions 2006-05-07
16:58:31.000000000 -0700
@@ -60,13 +60,21 @@
#----------------------------------#
wrt_makeflags() { # Apply MAKEFLAGS to build
#----------------------------------#
- if [[ "$MAKEFLAGS" != "unset" ]]; then
+ local pkg=$1
+
+ case $pkg in
+ gettext)
+ ;;
+ *)
+ if [[ "$MAKEFLAGS" != "unset" ]]; then
(
cat << EOF
@echo "export MAKEFLAGS=\"$MAKEFLAGS\"" >> envars
EOF
) >> $MKFILE.tmp
- else
- continue
- fi
+ else
+ continue
+ fi
+ ;;
+ esac
}
--
http://linuxfromscratch.org/mailman/listinfo/alfs-discuss
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
