Commit 3debecdc authored by Niels Möller's avatar Niels Möller

If a liboop dist is included in the build

package, install it in $pfx before trying to build lsh.

Rev: ChangeLog:1.812
Rev: misc/xenofarm.sh:1.25
parent dda42625
2004-11-07 Niels Mller <nisse@lysator.liu.se>
* misc/xenofarm.sh: If a liboop dist is included in the build
package, install it in $pfx before trying to build lsh.
2004-10-26 Niels Mller <nisse@lysator.liu.se>
* acinclude.m4 (LSH_DEPENDENCY_TRACKING): Need extra quoting in
......
......@@ -35,7 +35,8 @@ done
pfx=`pwd`/pfx
cfgargs="-C --with-include-path=/usr/local/include --with-lib-path=/usr/local/lib --prefix=$pfx $cfgargs"
oopcfgargs="-C --prefix=$pfx $cfgargs"
cfgargs="-C --with-include-path=/usr/local/include:$pfx/include --with-lib-path=/usr/local/lib:$pfx/lib --prefix=$pfx $cfgargs"
# Fix PATH for system where the default environment is broken
......@@ -64,6 +65,8 @@ exec > r/shlog.txt 2>&1
BASE=`echo lsh-*.tar.gz | sed 's/.tar.gz$//'`
VERS=`echo "$BASE" | sed 's/^lsh-//'`
LIBOOPDIST=`echo liboop-*.tar.gz`
timeecho () {
# FIXME: Don't depend on GNU date
echo `LC_ALL=C TZ=UTC date '+%Y-%m-%d %H:%M:%S'`: "$@"
......@@ -184,6 +187,21 @@ status=good
echo 'FORMAT 2' > r/mainlog.txt
if [ -f $LIBOOPDIST ] ; then
# Install liboop in $pfx, before trying lsh
LIBOOPBASE=`echo $LIBOOPDIST | sed 's/.tar.gz$//'`
liboopstatus=good
else
liboopstatus=skip
fi
dotask 1 "oopunzip" "" "gzip -d $LIBOOPBASE.tar.gz" liboopstatus
dotask 1 "oopunpack" "" "tar xf $LIBOOPBASE.tar.gz" liboopstatus
dotask 1 "oopcfg" "cfgwarn" "cd $LIBOOPBASE && ./configure $oopcfgargs" liboopstatus
dotask 1 "oopmake "makewarn" "cd $LIBOOPBASE && make" liboopstatus
dotask 0 "oopcheck "makewarn" "cd $LIBOOPBASE && make check" liboopstatus
dotask 1 "oopinstall "makewarn" "cd $LIBOOPBASE && make install" liboopstatus
dotask 1 "unzip" "" "gzip -d $BASE.tar.gz"
dotask 1 "unpack" "" "tar xf $BASE.tar"
dotask 1 "cfg" "cfgwarn" \
......@@ -242,13 +260,16 @@ cp $BASE/src/spki/config.log r/spkiconfiglog.txt
cp $BASE/src/spki/config.h r/spkiconfig-h.txt
cp $BASE/config.h r/config-h.txt
cp $LIBOOPBASE/config.cache r/oopconfigcache.txt
cp $LIBOOPBASE/config.h r/oopconfig-h.txt
cp $LIBOOPBASE/config.log r/oopconfiglog.txt
find $BASE -name core -print > r/corefiles.txt
if test `wc -l < r/corefiles.txt` -eq 0
then
rm r/corefiles.txt
fi
env > r/environ.txt
echo $PATH > r/path.txt
makeinfo --version > r/makeinfo.txt
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment