From 322d20b1a1b5c0579e738c9f1da2f59dc4c5c4a9 Mon Sep 17 00:00:00 2001 From: Vanja Skuric Date: Sat, 2 Nov 2019 20:50:10 +0100 Subject: [PATCH 1/2] BUGFIX: Fixed libccmio link --- ThirdParty/AllMake.stage3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ThirdParty/AllMake.stage3 b/ThirdParty/AllMake.stage3 index 9b2139e1d..ca6169a36 100755 --- a/ThirdParty/AllMake.stage3 +++ b/ThirdParty/AllMake.stage3 @@ -92,7 +92,7 @@ then # [ ! -z "$WM_THIRD_PARTY_USE_LIBCCMIO_261" ] && { 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 echo "Using system installed Libccmio" From ca57cacacda8257d3e950ee109845abacb25884f Mon Sep 17 00:00:00 2001 From: Vanja Skuric Date: Sat, 2 Nov 2019 20:51:30 +0100 Subject: [PATCH 2/2] BUGFIX: Removed generation of build-id during rpmbuild; build-id requires unnecessary sudo privileges during RPM installations --- ThirdParty/tools/makeThirdPartyFunctionsForRPM | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ThirdParty/tools/makeThirdPartyFunctionsForRPM b/ThirdParty/tools/makeThirdPartyFunctionsForRPM index 9430685b8..8ce88cc15 100755 --- a/ThirdParty/tools/makeThirdPartyFunctionsForRPM +++ b/ThirdParty/tools/makeThirdPartyFunctionsForRPM @@ -184,7 +184,7 @@ rpm_build() #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 - 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 "$@" } #