Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix 2596 main v11.0 rpath compilation #2600

Merged
merged 3 commits into from
Jul 13, 2023
Merged

Bugfix 2596 main v11.0 rpath compilation #2600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b5e266
Removing disable-new-tags rpath option for GNU compilers 12.3 and abo…
jprestop Jul 3, 2023
2238961
Removed echo statements
jprestop Jul 3, 2023
90a1e38
Adding new config file for narya
jprestop Jul 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions internal/scripts/installation/compile_MET_all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ fi
COMPILER_FAMILY=` echo $COMPILER | cut -d'_' -f1`
COMPILER_VERSION=`echo $COMPILER | cut -d'_' -f2`
COMPILER_MAJOR_VERSION=`echo $COMPILER_VERSION | cut -d'.' -f1`
COMPILER_MINOR_VERSION=`echo $COMPILER_VERSION | cut -d'.' -f2`

echo
echo "USE_MODULES = ${USE_MODULES}"
Expand Down Expand Up @@ -837,6 +838,13 @@ if [ $COMPILE_MET -eq 1 ]; then
export MET_PYTHON_LD=${MET_PYTHON_LD}
export MET_PYTHON_CC=${MET_PYTHON_CC}
export LDFLAGS="-Wl,--disable-new-dtags"

if [[ ${COMPILER_FAMILY} == "gnu" ]]; then
if [[ (${COMPILER_MAJOR_VERSION} -ge 12) && (${COMPILER_MINOR_VERSION} -ge 3) ]]; then
export LDFLAGS=""
fi
fi

# https://www.gnu.org/software/bash/manual/html_node/Shell-Parameter-Expansion.html
# ${parameter:+word}
# If parameter is null or unset, nothing is substituted, otherwise the expansion of word is substituted.
Expand Down
26 changes: 26 additions & 0 deletions internal/scripts/installation/config/install_met_env.narya
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
export TEST_BASE=/Volumes/d1/jpresto/projects/MET/MET_installation/11.0.2
export COMPILER=gnu_12.3.0
export MET_SUBDIR=${TEST_BASE}
export MET_TARBALL=v11.0.2.tar.gz
export USE_MODULES=FALSE
export MET_PYTHON=/opt/local
export MET_PYTHON_CC=-I${MET_PYTHON}/Library/Frameworks/Python.framework/Versions/3.10/include/python3.10
export MET_PYTHON_LD=`python3-config --ldflags --embed`
export SET_D64BIT=FALSE
export CFLAGS="-Wall -g"
export CXXFLAGS="-Wall -g"

# If you've already compiled these and don't need to compile them again, set the following;
# Otherwise, if you do need to install these libraries, comment out the variables below
export EXTERNAL_LIBS=${TEST_BASE}/external_libs
#export MET_GRIB2CLIB=${EXTERNAL_LIBS}/lib
#export MET_GRIB2CINC=${EXTERNAL_LIBS}/include
#export GRIB2CLIB_NAME=-lgrib2c
#export MET_BUFRLIB=${EXTERNAL_LIBS}/lib
#export BUFRLIB_NAME=-lbufr
#export MET_NETCDF=${EXTERNAL_LIBS}
#export MET_HDF5=${EXTERNAL_LIBS}
#export MET_GSL=${EXTERNAL_LIBS}
#export LIB_JASPER=${EXTERNAL_LIBS}/lib
#export LIB_LIBPNG=${EXTERNAL_LIBS}/lib
#export LIB_Z=${EXTERNAL_LIBS}/lib