-
Notifications
You must be signed in to change notification settings - Fork 24
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.
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.1 rpath compilation #2614
Merged
jprestop
merged 9 commits into
main_v11.1
from
bugfix_2596_main_v11.1_rpath_compilation
Jul 20, 2023
Merged
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
984db71
Removing disable-new-tags rpath option for GNU compilers 12.3 and abo…
jprestop 7dc7f77
Adding configuration file for narya
jprestop 1db74c9
Resolving sed error 'invalid command code m'
jprestop 258fee5
Merge branch 'main_v11.1' of github.com:dtcenter/MET into bugfix_2596…
jprestop 6739aee
Modified code to determine OS and take action to build NetCDF-CXX and…
jprestop 7cb91e1
Added documentation about the MAKE_ARGS option
jprestop d73f8a6
Made suggested changes by George
jprestop f3e8e10
Adding back inadvertently removed LIB_Z to LDFLAGS in HDF5 compilation
jprestop 7f307fb
Remove unnecessary indentation
jprestop File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
internal/scripts/installation/config/install_met_env.narya
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
export TEST_BASE=/Volumes/d1/jpresto/projects/MET/MET_installation/11.1.0 | ||
export COMPILER=gnu_12.3.0 | ||
export MET_SUBDIR=${TEST_BASE} | ||
export MET_TARBALL=v11.1.0.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 MAKE_ARGS=-j | ||
export CXXFLAGS="-std=c++11" | ||
#export FFLAGS="-std=legacy" | ||
|
||
# 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 |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why was this added? I don't see it used anywhere in the script.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @georgemccabe. I'll take a closer look at the other comments tomorrow, but I added the COMPILER_MAJOR_VERSION and COMPILER_MINOR_VERSION because it was originally thought that the problem lied with gcc 12.3.0. It didn't, however, I could see potentially using these in the future so I left them in.