Merge commit 'ca57cacacda8257d3e950ee109845abacb25884f'
This commit is contained in:
commit
c5fa11371c
2 changed files with 2 additions and 2 deletions
2
ThirdParty/AllMake.stage3
vendored
2
ThirdParty/AllMake.stage3
vendored
|
@ -92,7 +92,7 @@ then
|
||||||
#
|
#
|
||||||
[ ! -z "$WM_THIRD_PARTY_USE_LIBCCMIO_261" ] && {
|
[ ! -z "$WM_THIRD_PARTY_USE_LIBCCMIO_261" ] && {
|
||||||
echo "Building Libccmio 2.6.1"
|
echo "Building Libccmio 2.6.1"
|
||||||
( rpm_make -p libccmio-2.6.1 -s libccmio-2.6.1.spec -u http://portal.nersc.gov/project/visit/third_party/libccmio-2.6.1.tar.gz )
|
( rpm_make -p libccmio-2.6.1 -s libccmio-2.6.1.spec -u http://downloads.sourceforge.net/project/foam-extend/ThirdParty/libccmio-2.6.1.tar.gz )
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
echo "Using system installed Libccmio"
|
echo "Using system installed Libccmio"
|
||||||
|
|
|
@ -184,7 +184,7 @@ rpm_build()
|
||||||
#rpmbuild --define "_topdir $buildBase" --dbpath $buildBase/rpmDB --clean -bb ./SPECS/$specFile "$@"
|
#rpmbuild --define "_topdir $buildBase" --dbpath $buildBase/rpmDB --clean -bb ./SPECS/$specFile "$@"
|
||||||
#
|
#
|
||||||
# Let's keep the compilation directory alive for now in order to facilitate postmortems of failed compilations
|
# Let's keep the compilation directory alive for now in order to facilitate postmortems of failed compilations
|
||||||
rpmbuild --define "_topdir $buildBase" --dbpath $buildBase/rpmDB -bb ./SPECS/$specFile "$@"
|
rpmbuild --define "_build_id_links none" --define "_topdir $buildBase" --dbpath $buildBase/rpmDB -bb ./SPECS/$specFile "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
Reference in a new issue