Update of /cvsroot/boost/boost/tools/jam/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24307
Modified Files:
build.jam
Log Message:
Fix rpm building on Linux installs that have both rpmbuild and rpm.
Index: build.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/jam/src/build.jam,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- build.jam 6 Jun 2006 23:58:07 -0000 1.83
+++ build.jam 7 Jun 2006 02:59:15 -0000 1.84
@@ -762,7 +762,8 @@
if $(NT)
{
- zip ?= [ GLOB "$(ProgramFiles:J= )\\7-ZIP" "C:\\Program Files\\7-ZIP" :
"7z.exe" "7zn.exe" ] ;
+ zip ?= [ GLOB "$(ProgramFiles:J= )\\7-ZIP" "C:\\Program Files\\7-ZIP" :
"7z.exe" ] ;
+ zip ?= [ GLOB "$(ProgramFiles:J= )\\7-ZIP" "C:\\Program Files\\7-ZIP" :
"7zn.exe" ] ;
zip ?= [ GLOB $(PATH) : zip.exe ] ;
zip ?= zip ;
zip = $(zip[1]) ;
@@ -849,7 +850,10 @@
}
# RPM distro file.
-rpm-tool = [ GLOB $(PATH) : "rpmbuild" "rpm" ] ;
+rpm-tool = [ GLOB $(PATH) : "rpmbuild" ] ;
+rpm-tool ?= [ GLOB $(PATH) : "rpm" ] ;
+rpm-tool = $(rpm-tool[1]) ;
+ECHO --- [$(rpm-tool)] ;
rule .rpm ( name : source )
{
local rpm-arch = ;
@@ -878,8 +882,9 @@
.clean $(name).$(rpm-arch).rpm $(name).src.rpm ;
}
actions [RPM] {
+ set -e
export BOOST_JAM_TOOLSET="$(toolset)"
- $(rpm-tool[1]) -ta $(target-opt)$(arch) $(>) | tee rpm.out
+ $(rpm-tool) -ta $(target-opt)$(arch) $(>) | tee rpm.out
cp `grep -e '^Wrote:' rpm.out | sed 's/^Wrote: //'` .
rm -f rpm.out
}
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
