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

No need to retain TCL's directory anymore, and a few typo fixes.

Browse source
This commit is contained in:
Jeremy Huntwork 2005-12-16 16:42:49 +00:00
parent e9dba989ce
commit 934947950f
1 changed files with 7 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
jhalfs
View file

@ -322,7 +322,7 @@ get_sources() {
# Needed for Groff patchlevel patch on UTF-8 branch # Needed for Groff patchlevel patch on UTF-8 branch
GROFFLEVEL=`grep "groff-patchlevel" $JHALFSDIR/packages | sed -e 's/groff-patchlevel //' -e 's/"//g'` GROFFLEVEL=`grep "groff-patchlevel" $JHALFSDIR/packages | sed -e 's/groff-patchlevel //' -e 's/"//g'`
# There is some entities that aren't valid package entities. # There are some entities that aren't valid packages.
if [ "$PKG" = "expect-lib" -o "$PKG" = "linux-dl" -o "$PKG" = "groff-patchlevel" ] ; then continue ; fi if [ "$PKG" = "expect-lib" -o "$PKG" = "linux-dl" -o "$PKG" = "groff-patchlevel" ] ; then continue ; fi
VRS=`echo $i | sed -e 's/.* //' -e 's/"//g'` VRS=`echo $i | sed -e 's/.* //' -e 's/"//g'`
@ -420,7 +420,7 @@ chapter5_Makefiles() {
# Keep the script file name # Keep the script file name
i=`basename $file` i=`basename $file`
# If no testsuites will be run, then TCL, Expect and DejaGNU isn't needed # If no testsuites will be run, then TCL, Expect and DejaGNU aren't needed
if [ "$TOOLCHAINTEST" = "0" ]; then if [ "$TOOLCHAINTEST" = "0" ]; then
if [[ `_IS_ $i tcl` ]] || [[ `_IS_ $i expect` ]] || [[ `_IS_ $i dejagnu` ]] ; then if [[ `_IS_ $i tcl` ]] || [[ `_IS_ $i expect` ]] || [[ `_IS_ $i dejagnu` ]] ; then
continue continue
@ -479,8 +479,8 @@ EOF
fi fi
# Dump the path to the Binutils or TCL sources directory. # Dump the path to the Binutils sources directory.
if [[ `_IS_ $i binutils` ]] || [[ `_IS_ $i tcl` ]] ; then if [[ `_IS_ $i binutils` ]] ; then
( (
cat << EOF cat << EOF
echo "\$(LFS)\$(SRC)/\$\$ROOT" > sources-dir echo "\$(LFS)\$(SRC)/\$\$ROOT" > sources-dir
@ -494,15 +494,6 @@ EOF
@echo "PKGDIR=\$(LFS)\$(SRC)/binutils-build" > envars && \\ @echo "PKGDIR=\$(LFS)\$(SRC)/binutils-build" > envars && \\
echo "export PKGDIR" >> envars echo "export PKGDIR" >> envars
EOF EOF
) >> $MKFILE.tmp
# For the Expect build we need to set the TCLPATH envar.
elif [[ `_IS_ $i expect` ]] ; then
(
cat << EOF
echo "TCLPATH=\`cat sources-dir\`" >> envars && \\
echo "export TCLPATH" >> envars
EOF
) >> $MKFILE.tmp ) >> $MKFILE.tmp
# Everything else, add a true statment so we don't confuse make # Everything else, add a true statment so we don't confuse make
@ -525,10 +516,10 @@ EOF
) >> $MKFILE.tmp ) >> $MKFILE.tmp
# Remove the build directory(ies) except if the package build fails # Remove the build directory(ies) except if the package build fails
# (to can review config.cache, config.log, and like.) # (so we can review config.cache, config.log, etc.)
# For Binutils and TCL the sources must be retained some time. # For Binutils the sources must be retained for some time.
if [ "$vrs" != "" ] ; then if [ "$vrs" != "" ] ; then
if [[ ! `_IS_ $i binutils` ]] && [[ ! `_IS_ $i tcl` ]] ; then if [[ ! `_IS_ $i binutils` ]] ; then
( (
cat << EOF cat << EOF
@ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\ @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
@ -552,16 +543,6 @@ EOF
) >> $MKFILE.tmp ) >> $MKFILE.tmp
fi fi
# Remove the TCL sources after a successful Expect build.
if [[ `_IS_ $i expect` ]] ; then
(
cat << EOF
@rm -r \`cat sources-dir\` && \\
rm sources-dir
EOF
) >> $MKFILE.tmp
fi
# Include a touch of the target name so make can check # Include a touch of the target name so make can check
# if it's already been made. # if it's already been made.
( (