From 6be52fe7e84539e023cc400cff3e58ab34568442 Mon Sep 17 00:00:00 2001 From: Martin Beaudoin Date: Thu, 28 Jun 2018 20:40:30 -0400 Subject: [PATCH] ThirdParty: bumping mesquite to version 2.3.0 --- ThirdParty/AllMake.stage3 | 7 + ThirdParty/rpmBuild/SPECS/mesquite-2.3.0.spec | 175 ++++++++++++++++++ etc/bashrc | 2 +- etc/cshrc | 2 +- etc/prefs.csh-EXAMPLE | 2 +- etc/prefs.sh-EXAMPLE | 2 +- etc/prefs.sh.mingw | 2 +- etc/settings.csh | 3 + etc/settings.sh | 4 + 9 files changed, 194 insertions(+), 5 deletions(-) create mode 100644 ThirdParty/rpmBuild/SPECS/mesquite-2.3.0.spec diff --git a/ThirdParty/AllMake.stage3 b/ThirdParty/AllMake.stage3 index a54a1d3ac..9b2139e1d 100755 --- a/ThirdParty/AllMake.stage3 +++ b/ThirdParty/AllMake.stage3 @@ -108,6 +108,13 @@ then echo "Building Mesquite 2.1.2" ( rpm_make -p mesquite-2.1.2 -s mesquite-2.1.2.spec -u http://downloads.sourceforge.net/project/foam-extend/ThirdParty/mesquite-2.1.2.tar.gz ) } + # Mesquite 2.3.0 + # + [ ! -z "$WM_THIRD_PARTY_USE_MESQUITE_230" ] && { + echo "Building Mesquite 2.3.0" + ( rpm_make -p mesquite-2.3.0 -s mesquite-2.3.0.spec -u https://software.sandia.gov/mesquite/mesquite-2.3.0.tar.gz ) + # ( rpm_make -p mesquite-2.3.0 -s mesquite-2.3.0.spec -u http://downloads.sourceforge.net/project/foam-extend/ThirdParty/mesquite-2.3.0.tar.gz ) + } else echo "Using system installed Mesquite" echo "" diff --git a/ThirdParty/rpmBuild/SPECS/mesquite-2.3.0.spec b/ThirdParty/rpmBuild/SPECS/mesquite-2.3.0.spec new file mode 100644 index 000000000..ce422678d --- /dev/null +++ b/ThirdParty/rpmBuild/SPECS/mesquite-2.3.0.spec @@ -0,0 +1,175 @@ +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | foam-extend: Open Source CFD +# \\ / O peration | +# \\ / A nd | For copyright notice see file Copyright +# \\/ M anipulation | +#------------------------------------------------------------------------------ +# License +# This file is part of foam-extend. +# +# foam-extend is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# foam-extend is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with foam-extend. If not, see . +# +# Script +# RPM spec file for mesquite-2.3.0 +# +# Description +# RPM spec file for creating a relocatable RPM +# +# Author: +# Martin Beaudoin (2018) +# +# Contributor: +# Philippose Rajan : patch0 for gcc 4.6.x +# +#------------------------------------------------------------------------------ + +# We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable +%{expand:%%define _WM_THIRD_PARTY_DIR %(echo $WM_THIRD_PARTY_DIR)} +%{expand:%%define _WM_OPTIONS %(echo $WM_OPTIONS)} + +# Disable the generation of debuginfo packages +%define debug_package %{nil} + +# The topdir needs to point to the $WM_THIRD_PARTY/rpmbuild directory +%define _topdir %{_WM_THIRD_PARTY_DIR}/rpmBuild +%define _tmppath %{_topdir}/tmp + +# Will install the package directly $WM_THIRD_PARTY_DIR +# Some comments about package relocation: +# By using this prefix for the Prefix: parameter in this file, you will make this +# package relocatable. +# +# This is fine, as long as your software is itself relocatable. +# +# Simply take note that libraries built with libtool are not relocatable because the +# prefix we specify will be hard-coded in the library .la files. +# Ref: http://sourceware.org/autobook/autobook/autobook_80.html +# +# In that case, if you ever change the value of the $WM_THIRD_PARTY_DIR, you will +# not be able to reutilize this RPM, even though it is relocatable. You will need to +# regenerate the RPM. +# +%define _prefix %{_WM_THIRD_PARTY_DIR} + +%define name mesquite +%define release %{_WM_OPTIONS} +%define version 2.3.0 + +%define buildroot %{_topdir}/BUILD/%{name}-%{version}-root + +BuildRoot: %{buildroot} +Summary: mesquite +License: Unkown +Name: %{name} +Version: %{version} +Release: %{release} +URL: https://software.sandia.gov/mesquite +Source: %url/%{name}-%{version}.tar.gz +Prefix: %{_prefix} +Group: Development/Tools + +%define _installPrefix %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS} + +%description +%{summary} + +%prep +%setup -q + + +%build + # export WM settings in a form that GNU configure recognizes + [ -n "$WM_CC" ] && export CC="$WM_CC" + [ -n "$WM_FC" ] && export FC="$WM_FC" + [ -n "$WM_CXX" ] && export CXX="$WM_CXX" + [ -n "$WM_CFLAGS" ] && export CFLAGS="$WM_CFLAGS" + [ -n "$WM_FCFLAGS" ] && export FCFLAGS="$WM_FCFLAGS" + [ -n "$WM_CXXFLAGS" ] && export CXXFLAGS="$WM_CXXFLAGS" + [ -n "$WM_LDFLAGS" ] && export LDFLAGS="$WM_LDFLAGS" + + ./configure \ + --prefix=%{_installPrefix} \ + --libdir=%{_installPrefix}/lib \ + --enable-release \ + --disable-debug-assertions \ + --enable-shared \ + --without-cppunit \ + --enable-trap-fpe \ + --disable-function-timers + + # Remove the file include/Mesquite_all_headers.hpp + # This file will be regenerated during the compilation process + [ -e include/Mesquite_all_headers.hpp ] && rm -f include/Mesquite_all_headers.hpp + + [ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1 + make -j $WM_NCOMPPROCS OPTFLAGS="-O3 -mtune=native -fPIC" + +%install + make install DESTDIR=$RPM_BUILD_ROOT + + # Creation of foam-extend specific .csh and .sh files" + + echo "" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" + echo "" + # + # Generate package specific .sh file for foam-extend + # +mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc +cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export MESQUITE_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS +export MESQUITE_BIN_DIR=\$MESQUITE_DIR/bin +export MESQUITE_LIB_DIR=\$MESQUITE_DIR/lib +export MESQUITE_INCLUDE_DIR=\$MESQUITE_DIR/include + +# Enable access to the package runtime applications and libraries +[ -d \$MESQUITE_BIN_DIR ] && _foamAddPath \$MESQUITE_BIN_DIR +[ -d \$MESQUITE_LIB_DIR ] && _foamAddLib \$MESQUITE_LIB_DIR +DOT_SH_EOF + + # + # Generate package specific .csh file for foam-extend + # +cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +setenv MESQUITE_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS +setenv MESQUITE_BIN_DIR \$MESQUITE_DIR/bin +setenv MESQUITE_LIB_DIR \$MESQUITE_DIR/lib +setenv MESQUITE_INCLUDE_DIR \$MESQUITE_DIR/include + +if ( -e \$MESQUITE_BIN_DIR ) then + _foamAddPath \$MESQUITE_BIN_DIR +endif + +if ( -e \$MESQUITE_LIB_DIR ) then + _foamAddLib \$MESQUITE_LIB_DIR +endif +DOT_CSH_EOF + + #finally, generate a .tgz file for systems where using rpm for installing packages + # as a non-root user might be a problem. + (mkdir -p %{_topdir}/TGZS/%{_target_cpu}; cd $RPM_BUILD_ROOT/%{_prefix}; tar -zcvf %{_topdir}/TGZS/%{_target_cpu}/%{name}-%{version}.tgz packages/%{name}-%{version}) + + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%{_installPrefix} diff --git a/etc/bashrc b/etc/bashrc index da1b4816d..d50791216 100755 --- a/etc/bashrc +++ b/etc/bashrc @@ -103,7 +103,7 @@ export WM_THIRD_PARTY_USE_OPENMPI_310=1 export WM_THIRD_PARTY_USE_METIS_510=1 export WM_THIRD_PARTY_USE_PARMGRIDGEN_10=1 export WM_THIRD_PARTY_USE_LIBCCMIO_261=1 -export WM_THIRD_PARTY_USE_MESQUITE_212=1 +export WM_THIRD_PARTY_USE_MESQUITE_230=1 export WM_THIRD_PARTY_USE_SCOTCH_604=1 export WM_THIRD_PARTY_USE_PARMETIS_403=1 export WM_THIRD_PARTY_USE_PYFOAM_069=1 diff --git a/etc/cshrc b/etc/cshrc index ee2e50dc1..c6c940c2d 100644 --- a/etc/cshrc +++ b/etc/cshrc @@ -89,7 +89,7 @@ setenv WM_THIRD_PARTY_USE_OPENMPI_310 1 setenv WM_THIRD_PARTY_USE_METIS_510 1 setenv WM_THIRD_PARTY_USE_PARMGRIDGEN_10 1 setenv WM_THIRD_PARTY_USE_LIBCCMIO_261 1 -setenv WM_THIRD_PARTY_USE_MESQUITE_212 1 +setenv WM_THIRD_PARTY_USE_MESQUITE_230 1 setenv WM_THIRD_PARTY_USE_SCOTCH_604 1 setenv WM_THIRD_PARTY_USE_PARMETIS_403 1 setenv WM_THIRD_PARTY_USE_PYFOAM_069 1 diff --git a/etc/prefs.csh-EXAMPLE b/etc/prefs.csh-EXAMPLE index 4edcdd9e1..3a4c445df 100644 --- a/etc/prefs.csh-EXAMPLE +++ b/etc/prefs.csh-EXAMPLE @@ -225,7 +225,7 @@ setenv WM_THIRD_PARTY_USE_OPENMPI_310 1 setenv WM_THIRD_PARTY_USE_METIS_510 1 setenv WM_THIRD_PARTY_USE_PARMGRIDGEN_10 1 setenv WM_THIRD_PARTY_USE_LIBCCMIO_261 1 -setenv WM_THIRD_PARTY_USE_MESQUITE_212 1 +setenv WM_THIRD_PARTY_USE_MESQUITE_230 1 setenv WM_THIRD_PARTY_USE_SCOTCH_604 1 #setenv WM_THIRD_PARTY_USE_SCOTCH_600 1 setenv WM_THIRD_PARTY_USE_PARMETIS_403 1 diff --git a/etc/prefs.sh-EXAMPLE b/etc/prefs.sh-EXAMPLE index a93be19ff..4418fb7d6 100644 --- a/etc/prefs.sh-EXAMPLE +++ b/etc/prefs.sh-EXAMPLE @@ -238,7 +238,7 @@ export WM_THIRD_PARTY_USE_OPENMPI_310=1 export WM_THIRD_PARTY_USE_METIS_510=1 export WM_THIRD_PARTY_USE_PARMGRIDGEN_10=1 export WM_THIRD_PARTY_USE_LIBCCMIO_261=1 -export WM_THIRD_PARTY_USE_MESQUITE_212=1 +export WM_THIRD_PARTY_USE_MESQUITE_230=1 export WM_THIRD_PARTY_USE_SCOTCH_604=1 #export WM_THIRD_PARTY_USE_SCOTCH_600=1 export WM_THIRD_PARTY_USE_PARMETIS_403=1 diff --git a/etc/prefs.sh.mingw b/etc/prefs.sh.mingw index 6b8d19835..7b28d20e5 100644 --- a/etc/prefs.sh.mingw +++ b/etc/prefs.sh.mingw @@ -224,7 +224,7 @@ export PARAVIEW_BIN_DIR=$PARAVIEW_DIR/bin #export WM_THIRD_PARTY_USE_METIS_510=1 #export WM_THIRD_PARTY_USE_PARMGRIDGEN_10=1 #export WM_THIRD_PARTY_USE_LIBCCMIO_261=1 -#export WM_THIRD_PARTY_USE_MESQUITE_212=1 +#export WM_THIRD_PARTY_USE_MESQUITE_230=1 #export WM_THIRD_PARTY_USE_SCOTCH_604=1 ##export WM_THIRD_PARTY_USE_SCOTCH_600=1 #export WM_THIRD_PARTY_USE_PARMETIS_403=1 diff --git a/etc/settings.csh b/etc/settings.csh index 6465ff0aa..ae945eccb 100644 --- a/etc/settings.csh +++ b/etc/settings.csh @@ -510,6 +510,9 @@ endif if ( $?MESQUITE_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_MESQUITE_212 != 0 && -e $WM_THIRD_PARTY_DIR/packages/mesquite-2.1.2/platforms/$WM_OPTIONS ) then _foamSource $WM_THIRD_PARTY_DIR/packages/mesquite-2.1.2/platforms/$WM_OPTIONS/etc/mesquite-2.1.2.csh endif +if ( $?MESQUITE_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_MESQUITE_230 != 0 && -e $WM_THIRD_PARTY_DIR/packages/mesquite-2.3.0/platforms/$WM_OPTIONS ) then + _foamSource $WM_THIRD_PARTY_DIR/packages/mesquite-2.3.0/platforms/$WM_OPTIONS/etc/mesquite-2.3.0.csh +endif # Metis library if available # ~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/etc/settings.sh b/etc/settings.sh index 8084d2569..bc851aa08 100755 --- a/etc/settings.sh +++ b/etc/settings.sh @@ -610,6 +610,10 @@ export MPI_BUFFER_SIZE _foamSource $WM_THIRD_PARTY_DIR/packages/mesquite-2.1.2/platforms/$WM_OPTIONS/etc/mesquite-2.1.2.sh } [ "$FOAM_VERBOSE" -a "$PS1" ] && echo " MESQUITE_DIR is initialized to: $MESQUITE_DIR" +[ -z "$MESQUITE_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_MESQUITE_230 ] && [ -e $WM_THIRD_PARTY_DIR/packages/mesquite-2.3.0/platforms/$WM_OPTIONS ] && { + _foamSource $WM_THIRD_PARTY_DIR/packages/mesquite-2.3.0/platforms/$WM_OPTIONS/etc/mesquite-2.3.0.sh +} +[ "$FOAM_VERBOSE" -a "$PS1" ] && echo " MESQUITE_DIR is initialized to: $MESQUITE_DIR" # Load Metis library