OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Jan-2004 13:38:44
Branch: HEAD Handle: 2004011212384300
Modified files:
openpkg-src/openpkg openpkg.spec
Log:
pick up tools from existing bootstrap if possible
Summary:
Revision Changes Path
1.263 +30 -15 openpkg-src/openpkg/openpkg.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.262 -r1.263 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 12 Jan 2004 12:35:29 -0000 1.262
+++ openpkg-src/openpkg/openpkg.spec 12 Jan 2004 12:38:43 -0000 1.263
@@ -190,41 +190,56 @@
echo "shtool=$shtool" >>./.buildenv
# manually make sure tar(1) is available
- l_tar=`sh $shtool path gtar tar`; export l_tar
+ l_tar=""; [ ".%{?l_tar:set}" = .set ] && l_tar="%{l_tar}"; export l_tar
if [ ".$l_tar" = . ]; then
- echo "openpkg: prerequisite tool \`gtar' or \`tar' not found"
- exit 1
+ l_tar=`sh $shtool path gtar tar`
+ if [ ".$l_tar" = . ]; then
+ echo "openpkg: prerequisite tool \`gtar' or \`tar' not found"
+ exit 1
+ fi
fi
echo "l_tar=\"$l_tar\"; export l_tar" >>.buildenv
# manually make sure make(1) is available
- l_make=`sh $shtool path gmake make`; export l_make
+ l_make=""; [ ".%{?l_make:set}" = .set ] && l_make="%{l_make}"; export l_make
if [ ".$l_make" = . ]; then
- echo "openpkg: prerequisite tool \`gmake' or \`make' not found"
- exit 1
+ l_make=`sh $shtool path gmake make`
+ if [ ".$l_make" = . ]; then
+ echo "openpkg: prerequisite tool \`gmake' or \`make' not found"
+ exit 1
+ fi
fi
echo "l_make=\"$l_make\"; export l_make" >>.buildenv
# manually make sure cc(1) is available
- l_cc=`sh $shtool path gcc cc`; export l_cc
+ l_cc=""; [ ".%{?l_cc:set}" = .set ] && l_cc="%{l_cc}"; export l_cc
if [ ".$l_cc" = . ]; then
- echo "openpkg: prerequisite tool \`gcc' or \`cc' not found"
- exit 1
+ l_cc=`sh $shtool path gcc cc`
+ if [ ".$l_cc" = . ]; then
+ echo "openpkg: prerequisite tool \`gcc' or \`cc' not found"
+ exit 1
+ fi
fi
echo "l_cc=\"$l_cc\"; export l_cc" >>.buildenv
# manually make sure ar(1) is available
- l_ar=`sh $shtool path ar`; export l_ar
+ l_ar=""; [ ".%{?l_ar:set}" = .set ] && l_ar="%{l_ar}"; export l_ar
if [ ".$l_ar" = . ]; then
- echo "openpkg: prerequisite tool \`ar' not found"
- exit 1
+ l_ar=`sh $shtool path ar`
+ if [ ".$l_ar" = . ]; then
+ echo "openpkg: prerequisite tool \`ar' not found"
+ exit 1
+ fi
fi
# manually make sure ld(1) is available
- l_ld=`sh $shtool path ld`; export l_ld
+ l_ld=""; [ ".%{?l_ld:set}" = .set ] && l_ld="%{l_ld}"; export l_ld
if [ ".$l_ld" = . ]; then
- echo "openpkg: prerequisite tool \`ld' not found"
- exit 1
+ l_ld=`sh $shtool path ld`
+ if [ ".$l_ld" = . ]; then
+ echo "openpkg: prerequisite tool \`ld' not found"
+ exit 1
+ fi
fi
# determine path to aux.usrgrp.sh script
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
