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

Jump to bottom

Rpath for netcdf libs #164

Merged
merged 5 commits into from
May 26, 2022
Merged

Rpath for netcdf libs #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
97c532f
added rpath config for gnu compiler.
May 18, 2022
f416c03
Added rpath config in addiitonal Makefile.am files.
May 18, 2022
36ac602
Change in rpath configuration. Adding fortran netcdf lib.
May 18, 2022
2959819
Merge branch 'NOAA-GFDL:master' into rpath
ngs333 May 20, 2022
86f40d9
Fixing change to code-version.
May 20, 2022
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
20 changes: 20 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,26 @@ AS_IF([test $enable_ocean_model_grid_generator = yes],
AC_CONFIG_SUBDIRS([tools/ocean_model_grid_generator])
)

#Code for setting rpath based ncview's configure.in code.
echo "ac_computer_gnu: $ac_compiler_gnu"
if test x$ac_compiler_gnu = xyes; then
RPATH_FLAGS=""
for word in $NETCDF_LDFLAGS; do
if test `expr $word : -L/` -eq 3; then
RPDIR=${word:2}
RPATH_FLAGS="$RPATH_FLAGS -Wl,-rpath,$RPDIR"
fi
done
for word in $NETCDF_FCLDFLAGS; do
if test `expr $word : -L/` -eq 3; then
RPDIR=${word:2}
RPATH_FLAGS="$RPATH_FLAGS -Wl,-rpath,$RPDIR"
fi
done
AC_SUBST(RPATH_FLAGS)
fi


# Output files
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_FILES([Makefile
Expand Down
9 changes: 5 additions & 4 deletions postprocessing/land_utils/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,21 @@ noinst_LIBRARIES = libnfu.a

AM_FCFLAGS = $(FC_DEFAULT_REAL_KIND8_FLAG) $(NETCDF_FCFLAGS)
AM_CFLAGS = $(NETCDF_CFLAGS)
LDADD = $(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS)

libnfu_a_SOURCES = nfu.F90 nfu_compress.F90

combine_ncc_SOURCES = combine-ncc.F90
combine_ncc_LDADD = libnfu.a $(NETCDF_FCLDFLAGS) $(NETCDF_FCLIBS)
combine_ncc_LDADD = libnfu.a $(NETCDF_FCLDFLAGS) $(NETCDF_FCLIBS) $(RPATH_FLAGS)

decompress_ncc_SOURCES = decompress-ncc.F90
decompress_ncc_LDADD = libnfu.a $(NETCDF_FCLDFLAGS) $(NETCDF_FCLIBS)
decompress_ncc_LDADD = libnfu.a $(NETCDF_FCLDFLAGS) $(NETCDF_FCLIBS) $(RPATH_FLAGS)

scatter_ncc_SOURCES = scatter-ncc.F90
scatter_ncc_LDADD = libnfu.a $(NETCDF_FCLDFLAGS) $(NETCDF_FCLIBS)
scatter_ncc_LDADD = libnfu.a $(NETCDF_FCLDFLAGS) $(NETCDF_FCLIBS) $(RPATH_FLAGS)

is_compressed_SOURCES = is-compressed.c
is_compressed_LDADD = $(NETCDF_LDFLAGS) $(NETCDF_LIBS)
is_compressed_LDADD = $(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS)

nfu_mod.$(FC_MODEXT): nfu.$(OBJEXT)
nfu_compress_mod.$(FC_MODEXT): nfu_compress.$(OBJEXT)
Expand Down
2 changes: 1 addition & 1 deletion postprocessing/list_ncvars/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dist_bin_SCRIPTS = list_ncvars.csh

list_ncvars_exe_SOURCES = list_ncvars.f90
list_ncvars_exe_FCFLAGS = $(NETCDF_FCFLAGS) $(FC_DEFAULT_REAL_KIND8_FLAG) $(AM_FCFLAGS)
list_ncvars_exe_LDADD = $(NETCDF_FCLDFLAGS) $(NETCDF_FCLIBS)
list_ncvars_exe_LDADD = $(NETCDF_FCLDFLAGS) $(NETCDF_FCLIBS) $(RPATH_FLAGS)

clean-local:
$(RM) *.mod
3 changes: 1 addition & 2 deletions postprocessing/mppnccombine/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ bin_PROGRAMS = mppnccombine

mppnccombine_SOURCES = mppnccombine.c
mppnccombine_CFLAGS = $(NETCDF_CFLAGS) $(AM_CFLAGS)
mppnccombine_LDADD = $(NETCDF_LDFLAGS) $(NETCDF_LIBS) -lm

mppnccombine_LDADD = $(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS) -lm
clean-local:
$(RM) *.mod
2 changes: 1 addition & 1 deletion postprocessing/plevel/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ bin_PROGRAMS = PLEV.exe PLEV.r4.exe
dist_bin_SCRIPTS = plevel.sh

AM_FCFLAGS = $(NETCDF_FCFLAGS)
LDADD = $(NETCDF_FCLDFLAGS) $(NETCDF_FCLIBS)
LDADD = $(NETCDF_FCLDFLAGS) $(NETCDF_FCLIBS) $(RPATH_FLAGS)

PLEV_exe_SOURCES = plev_constants.F90 \
moisture_convert.F90 \
Expand Down
2 changes: 1 addition & 1 deletion postprocessing/timavg/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ bin_PROGRAMS = TAVG.exe TAVG.r4.exe
dist_bin_SCRIPTS = timavg.csh

AM_FCFLAGS = $(NETCDF_FCFLAGS)
LDADD = $(NETCDF_FCLDFLAGS) $(NETCDF_FCLIBS)
LDADD = $(NETCDF_FCLDFLAGS) $(NETCDF_FCLIBS) $(RPATH_FLAGS)

TAVG_exe_SOURCES = time_average.f90
TAVG_exe_FCFLAGS = $(FC_DEFAULT_REAL_KIND8_FLAG) $(AM_FCFLAGS)
Expand Down
2 changes: 1 addition & 1 deletion tools/check_mask/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ bin_PROGRAMS = check_mask
AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils \
$(NETCDF_CFLAGS)
LDADD = $(top_builddir)/tools/libfrencutils/libfrencutils.a \
$(NETCDF_LDFLAGS) $(NETCDF_LIBS)
$(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS)

check_mask_SOURCES = check_mask.c
2 changes: 1 addition & 1 deletion tools/cubic_utils/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ bin_PROGRAMS = make_remap_file
AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils \
$(NETCDF_CFLAGS)
LDADD = $(top_builddir)/tools/libfrencutils/libfrencutils.a \
$(NETCDF_LDFLAGS) $(NETCDF_LIBS)
$(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS)

make_remap_file_SOURCES = make_remap_file.c
2 changes: 1 addition & 1 deletion tools/fregrid/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ endif

AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils \
$(NETCDF_CFLAGS)
LDADD = $(NETCDF_LDFLAGS) $(NETCDF_LIBS)
LDADD = $(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS)

fregrid_SOURCES = bilinear_interp.c \
bilinear_interp.h \
Expand Down
2 changes: 1 addition & 1 deletion tools/make_coupler_mosaic/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ endif

AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils \
$(NETCDF_CFLAGS)
LDADD = $(NETCDF_LDFLAGS) $(NETCDF_LIBS)
LDADD = $(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS)

make_coupler_mosaic_SOURCES = make_coupler_mosaic.c
make_coupler_mosaic_LDADD = $(top_builddir)/tools/libfrencutils/libfrencutils.a $(LDADD)
Expand Down
3 changes: 2 additions & 1 deletion tools/make_hgrid/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@ if WITH_MPI
bin_PROGRAMS += make_hgrid_parallel
endif


AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils \
$(NETCDF_CFLAGS)
LDADD = $(NETCDF_LDFLAGS) $(NETCDF_LIBS)
LDADD = $(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS)

make_hgrid_SOURCES = create_conformal_cubic_grid.c \
create_gnomonic_cubic_grid.c \
Expand Down
2 changes: 1 addition & 1 deletion tools/make_land_domain/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ bin_PROGRAMS = make_land_domain
AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils \
$(NETCDF_CFLAGS)
LDADD = $(top_builddir)/tools/libfrencutils/libfrencutils.a \
$(NETCDF_LDFLAGS) $(NETCDF_LIBS)
$(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS)

make_land_domain_SOURCES = make_land_domain.c
2 changes: 1 addition & 1 deletion tools/make_quick_mosaic/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ bin_PROGRAMS = make_quick_mosaic
AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils \
$(NETCDF_CFLAGS)
LDADD = $(top_builddir)/tools/libfrencutils/libfrencutils.a \
$(NETCDF_LDFLAGS) $(NETCDF_LIBS)
$(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS)

make_quick_mosaic_SOURCES = make_quick_mosaic.c
2 changes: 1 addition & 1 deletion tools/make_regional_mosaic/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ bin_PROGRAMS = make_regional_mosaic
AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils \
$(NETCDF_CFLAGS)
LDADD = $(top_builddir)/tools/libfrencutils/libfrencutils.a \
$(NETCDF_LDFLAGS) $(NETCDF_LIBS)
$(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS)

make_regional_mosaic_SOURCES = make_regional_mosaic.c
2 changes: 1 addition & 1 deletion tools/make_solo_mosaic/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ bin_PROGRAMS = make_solo_mosaic
AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils \
$(NETCDF_CFLAGS)
LDADD = $(top_builddir)/tools/libfrencutils/libfrencutils.a \
$(NETCDF_LDFLAGS) $(NETCDF_LIBS)
$(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS)

make_solo_mosaic_SOURCES = get_contact.c \
get_contact.h \
Expand Down
2 changes: 1 addition & 1 deletion tools/make_topog/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ endif

AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils \
$(NETCDF_CFLAGS)
LDADD = $(NETCDF_LDFLAGS) $(NETCDF_LIBS)
LDADD = $(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS)

make_topog_SOURCES = make_topog.c \
topog.c \
Expand Down
2 changes: 1 addition & 1 deletion tools/make_vgrid/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ bin_PROGRAMS = make_vgrid
AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils \
$(NETCDF_CFLAGS)
LDADD = $(top_builddir)/tools/libfrencutils/libfrencutils.a \
$(NETCDF_LDFLAGS) $(NETCDF_LIBS)
$(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS)

make_vgrid_SOURCES = create_vgrid.c \
create_vgrid.h \
Expand Down
2 changes: 1 addition & 1 deletion tools/mppncscatter/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ bin_PROGRAMS = mppncscatter
AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils \
$(NETCDF_CFLAGS)
LDADD = $(top_builddir)/tools/libfrencutils/libfrencutils.a \
$(NETCDF_LDFLAGS) $(NETCDF_LIBS)
$(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS)

mppncscatter_SOURCES = common.h \
main.c \
Expand Down
2 changes: 1 addition & 1 deletion tools/nc_null_check/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ bin_PROGRAMS = nc_null_check
AM_FCFLAGS = -I$(top_srcdir)/tools/libfrencutils \
$(NETCDF_FCFLAGS)
LDADD = $(top_builddir)/tools/libfrencutils/libfrencutils.a \
$(NETCDF_FCLDFLAGS) $(NETCDF_FCLIBS)
$(NETCDF_FCLDFLAGS) $(NETCDF_FCLIBS) $(RPATH_FLAGS)

nc_null_check_SOURCES = nc_null_check.F90
2 changes: 1 addition & 1 deletion tools/ncexists/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ bin_PROGRAMS = ncexists
AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils \
$(NETCDF_CFLAGS)
LDADD = $(top_builddir)/tools/libfrencutils/libfrencutils.a \
$(NETCDF_LDFLAGS) $(NETCDF_LIBS)
$(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS)

ncexists_SOURCES = ncexists.c
2 changes: 1 addition & 1 deletion tools/remap_land/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ endif

AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils \
$(NETCDF_CFLAGS)
LDADD = $(NETCDF_LDFLAGS) $(NETCDF_LIBS)
LDADD = $(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS)

remap_land_SOURCES = remap_land.c
remap_land_LDADD = $(top_builddir)/tools/libfrencutils/libfrencutils.a $(LDADD)
Expand Down
2 changes: 1 addition & 1 deletion tools/river_regrid/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ bin_PROGRAMS = river_regrid
AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils \
$(NETCDF_CFLAGS)
LDADD = $(top_builddir)/tools/libfrencutils/libfrencutils.a \
$(NETCDF_LDFLAGS) $(NETCDF_LIBS)
$(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS)

river_regrid_SOURCES = river_regrid.c
2 changes: 1 addition & 1 deletion tools/runoff_regrid/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ endif

AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils \
$(NETCDF_CFLAGS)
LDADD = $(NETCDF_LDFLAGS) $(NETCDF_LIBS)
LDADD = $(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS)

runoff_regrid_SOURCES = runoff_regrid.c
runoff_regrid_LDADD = $(top_builddir)/tools/libfrencutils/libfrencutils.a $(LDADD)
Expand Down
2 changes: 1 addition & 1 deletion tools/simple_hydrog/lakes/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ FMSROOT = $(top_builddir)/tools/simple_hydrog/libfmslite

AM_CFLAGS = $(NETCDF_CFLAGS)
AM_FCFLAGS = -I$(FMSROOT) $(FC_DEFAULT_REAL_KIND8_FLAG) $(NETCDF_FCFLAGS)
LDADD = $(NETCDF_FCLDFLAGS) $(NETCDF_LIBS) $(NETCDF_FCLIBS)
LDADD = $(NETCDF_FCLDFLAGS) $(NETCDF_LIBS) $(NETCDF_FCLIBS) $(RPATH_FLAGS)

cr_lake_files_SOURCES = cr_lake_files.f90
cr_lake_files_LDADD = $(FMSROOT)/libfms.a $(LDADD)
Expand Down
6 changes: 3 additions & 3 deletions tools/simple_hydrog/postp/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ bin_PROGRAMS = cp_river_vars

AM_FCFLAGS = $(FC_DEFAULT_REAL_KIND8_FLAG) $(NETCDF_FCFLAGS)

LDADD = $(NETCDF_FCLDFLAGS) $(NETCDF_FCLIBS)
LDADD = $(NETCDF_FCLDFLAGS) $(NETCDF_FCLIBS) $(RPATH_FLAGS)

cp_river_vars_SOURCES = cp_river_vars.f90

cp_river_vars_SOURCES = cp_river_vars.f90

6 changes: 3 additions & 3 deletions tools/simple_hydrog/rmvpr/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ bin_PROGRAMS = rmv_parallel_rivers

AM_FCFLAGS = $(FC_DEFAULT_REAL_KIND8_FLAG) $(NETCDF_FCFLAGS)

LDADD = $(NETCDF_FCLDFLAGS) $(NETCDF_FCLIBS)
LDADD = $(NETCDF_FCLDFLAGS) $(NETCDF_FCLIBS) $(RPATH_FLAGS)

rmv_parallel_rivers_SOURCES = rmv_parallel_rivers.f90

rmv_parallel_rivers_SOURCES = rmv_parallel_rivers.f90


2 changes: 1 addition & 1 deletion tools/transfer_to_mosaic_grid/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ bin_PROGRAMS = transfer_to_mosaic_grid
AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils \
$(NETCDF_CFLAGS)
LDADD = $(top_builddir)/tools/libfrencutils/libfrencutils.a \
$(NETCDF_LDFLAGS) $(NETCDF_LIBS)
$(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS)

transfer_to_mosaic_grid_SOURCES = transfer_to_mosaic.c