OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-Feb-2007 23:57:31
Branch: HEAD Handle: 2007020422573001
Modified files:
openpkg-src/openpkg HISTORY rpmtool
Log:
rpmtool cflags tool detection must handle relative pathes (no gcc) and
absolute pathes (with gcc) - thanks to cs for pointing out
Summary:
Revision Changes Path
1.423 +1 -0 openpkg-src/openpkg/HISTORY
1.53 +13 -5 openpkg-src/openpkg/rpmtool
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.422 -r1.423 HISTORY
--- openpkg-src/openpkg/HISTORY 4 Feb 2007 20:12:55 -0000 1.422
+++ openpkg-src/openpkg/HISTORY 4 Feb 2007 22:57:30 -0000 1.423
@@ -2,6 +2,7 @@
2007
====
+20070204 rpmtool cflags tool detection must handle relative pathes (no gcc)
and absolute pathes (with gcc)
20070204 unbreak rpmtool cflags tool detection
20070130 minor fixes in rpmtool and the corresponding man page
20070130 upgrade to cURL 7.16.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmtool
============================================================================
$ cvs diff -u -r1.52 -r1.53 rpmtool
--- openpkg-src/openpkg/rpmtool 4 Feb 2007 20:12:55 -0000 1.52
+++ openpkg-src/openpkg/rpmtool 4 Feb 2007 22:57:31 -0000 1.53
@@ -450,11 +450,19 @@
cflags )
tool="$1"
- shtool=`echo $prog_path | sed -e 's;/[^/]*$;/shtool;'`
- sh $shtool path --suppress $tool
- if [ $? -ne 0 ]; then
- echo "$msgprefix:Error: specified tool \`$tool' not found or not
executable" 1>&2
- exit 1
+ echo $tool | grep ^/ >/dev/null
+ if [ $? -eq 0 ]; then
+ if [ ! -x "$tool" -o -d "$tool" ]; then
+ echo "$msgprefix:Error: specified tool \`$tool' not found or
not executable" 1>&2
+ exit 1
+ fi
+ else
+ shtool=`echo $prog_path | sed -e 's;/[^/]*$;/shtool;'`
+ sh $shtool path --suppress $tool
+ if [ $? -ne 0 ]; then
+ echo "$msgprefix:Error: specified tool \`$tool' not found in
PATH" 1>&2
+ exit 1
+ fi
fi
isgcc=no
if [ ".`($tool -v; $tool --version) </dev/null 2>&1 | grep -i
'gcc'`" != . ]; then
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
