From 682d6e1579e3c61fa330ca538f1386f9487591ff Mon Sep 17 00:00:00 2001 From: Julie Prestopnik Date: Wed, 5 Oct 2022 13:54:41 -0600 Subject: [PATCH 1/3] Per #2281, testing to ensure build fails due to linker error with --as-needed added to LDFLAGS internal/scripts/environment/development.docker --- internal/scripts/environment/development.docker | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/scripts/environment/development.docker b/internal/scripts/environment/development.docker index ec4bd202c3..39a3cb01aa 100644 --- a/internal/scripts/environment/development.docker +++ b/internal/scripts/environment/development.docker @@ -33,6 +33,7 @@ export CXXFLAGS=${CFLAGS} # Set LDFLAGS to include -rpath settings when compiling MET export LDFLAGS="-Wl,--disable-new-dtags" +export LDFLAGS="${LDFLAGS} -Wl,--as-needed" export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/local/lib:/usr/lib64:${MET_HDF}/lib:${MET_HDFEOS}/lib" # Variables required to run MET From a469716b651935bea8f9d36507d575a78607f54a Mon Sep 17 00:00:00 2001 From: Julie Prestopnik Date: Wed, 5 Oct 2022 15:36:15 -0600 Subject: [PATCH 2/3] Per #2281, modifying order in Makefiles, removing --as-needed from LDFLAGS --- internal/scripts/environment/development.docker | 1 - src/basic/vx_config/config.tab.cc | 2 +- src/tools/core/ensemble_stat/Makefile.am | 2 +- src/tools/core/ensemble_stat/Makefile.in | 2 +- src/tools/core/grid_stat/Makefile.am | 2 +- src/tools/core/grid_stat/Makefile.in | 2 +- src/tools/core/mode/Makefile.am | 4 ++-- src/tools/core/mode/Makefile.in | 2 +- src/tools/core/point_stat/Makefile.am | 2 +- src/tools/core/point_stat/Makefile.in | 2 +- src/tools/core/series_analysis/Makefile.am | 2 +- src/tools/core/series_analysis/Makefile.in | 2 +- src/tools/core/stat_analysis/Makefile.am | 2 +- src/tools/core/stat_analysis/Makefile.in | 2 +- src/tools/core/wavelet_stat/Makefile.am | 2 +- src/tools/core/wavelet_stat/Makefile.in | 2 +- src/tools/other/gen_ens_prod/Makefile.am | 2 +- src/tools/other/gen_ens_prod/Makefile.in | 2 +- src/tools/other/gsi_tools/Makefile.am | 4 ++-- src/tools/other/gsi_tools/Makefile.in | 4 ++-- src/tools/tc_utils/tc_gen/Makefile.am | 2 +- src/tools/tc_utils/tc_stat/Makefile.am | 2 +- 22 files changed, 24 insertions(+), 25 deletions(-) diff --git a/internal/scripts/environment/development.docker b/internal/scripts/environment/development.docker index 39a3cb01aa..ec4bd202c3 100644 --- a/internal/scripts/environment/development.docker +++ b/internal/scripts/environment/development.docker @@ -33,7 +33,6 @@ export CXXFLAGS=${CFLAGS} # Set LDFLAGS to include -rpath settings when compiling MET export LDFLAGS="-Wl,--disable-new-dtags" -export LDFLAGS="${LDFLAGS} -Wl,--as-needed" export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/local/lib:/usr/lib64:${MET_HDF}/lib:${MET_HDFEOS}/lib" # Variables required to run MET diff --git a/src/basic/vx_config/config.tab.cc b/src/basic/vx_config/config.tab.cc index 5b67009f59..43fe74766f 100644 --- a/src/basic/vx_config/config.tab.cc +++ b/src/basic/vx_config/config.tab.cc @@ -1389,7 +1389,7 @@ yyparse (void) YYDPRINTF ((stderr, "Starting parse\n")); - yystate = 8; + yystate = 0; yyerrstatus = 0; yynerrs = 0; yychar = YYEMPTY; /* Cause a token to be read. */ diff --git a/src/tools/core/ensemble_stat/Makefile.am b/src/tools/core/ensemble_stat/Makefile.am index 96d06158e7..b3c54e1fd0 100644 --- a/src/tools/core/ensemble_stat/Makefile.am +++ b/src/tools/core/ensemble_stat/Makefile.am @@ -28,10 +28,10 @@ ensemble_stat_LDADD = -lvx_stat_out \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ - -lvx_seeps \ -lvx_config \ -lvx_color \ -lvx_util_math \ diff --git a/src/tools/core/ensemble_stat/Makefile.in b/src/tools/core/ensemble_stat/Makefile.in index 9d532022da..d65846ec4b 100644 --- a/src/tools/core/ensemble_stat/Makefile.in +++ b/src/tools/core/ensemble_stat/Makefile.in @@ -335,10 +335,10 @@ ensemble_stat_LDADD = -lvx_stat_out \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ - -lvx_seeps \ -lvx_config \ -lvx_color \ -lvx_util_math \ diff --git a/src/tools/core/grid_stat/Makefile.am b/src/tools/core/grid_stat/Makefile.am index 4569f0ff7e..a117c965d2 100644 --- a/src/tools/core/grid_stat/Makefile.am +++ b/src/tools/core/grid_stat/Makefile.am @@ -28,10 +28,10 @@ grid_stat_LDADD = -lvx_stat_out \ -lvx_data2d_nccf \ -lvx_statistics \ -lvx_data2d \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ - -lvx_seeps \ -lvx_config \ -lvx_cal \ -lvx_util_math \ diff --git a/src/tools/core/grid_stat/Makefile.in b/src/tools/core/grid_stat/Makefile.in index f167bb520d..9cf9df8068 100644 --- a/src/tools/core/grid_stat/Makefile.in +++ b/src/tools/core/grid_stat/Makefile.in @@ -334,10 +334,10 @@ grid_stat_LDADD = -lvx_stat_out \ -lvx_data2d_nccf \ -lvx_statistics \ -lvx_data2d \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ - -lvx_seeps \ -lvx_config \ -lvx_cal \ -lvx_util_math \ diff --git a/src/tools/core/mode/Makefile.am b/src/tools/core/mode/Makefile.am index 4e1692b1c1..f89b8c9afa 100644 --- a/src/tools/core/mode/Makefile.am +++ b/src/tools/core/mode/Makefile.am @@ -48,9 +48,9 @@ mode_LDADD = -lvx_pxm \ -lvx_data2d_nccf \ -lvx_statistics \ -lvx_data2d \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ - -lvx_seeps \ -lvx_grid \ -lvx_config \ -lvx_bool_calc \ @@ -67,4 +67,4 @@ EXTRA_DIST = mode_exec.h \ mode_ps_table_defs.h \ mode_usage.h \ combine_boolplanes.h \ - objects_from_netcdf.h \ No newline at end of file + objects_from_netcdf.h diff --git a/src/tools/core/mode/Makefile.in b/src/tools/core/mode/Makefile.in index 9bc47116ec..34488bdbc9 100644 --- a/src/tools/core/mode/Makefile.in +++ b/src/tools/core/mode/Makefile.in @@ -373,9 +373,9 @@ mode_LDADD = -lvx_pxm \ -lvx_data2d_nccf \ -lvx_statistics \ -lvx_data2d \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ - -lvx_seeps \ -lvx_grid \ -lvx_config \ -lvx_bool_calc \ diff --git a/src/tools/core/point_stat/Makefile.am b/src/tools/core/point_stat/Makefile.am index 53e5719408..53b973ed93 100644 --- a/src/tools/core/point_stat/Makefile.am +++ b/src/tools/core/point_stat/Makefile.am @@ -27,10 +27,10 @@ point_stat_LDADD = -lvx_stat_out \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ - -lvx_seeps \ -lvx_config \ -lvx_gsl_prob \ -lvx_color \ diff --git a/src/tools/core/point_stat/Makefile.in b/src/tools/core/point_stat/Makefile.in index 7c1d1f2f9d..58f5811a41 100644 --- a/src/tools/core/point_stat/Makefile.in +++ b/src/tools/core/point_stat/Makefile.in @@ -334,10 +334,10 @@ point_stat_LDADD = -lvx_stat_out \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ - -lvx_seeps \ -lvx_config \ -lvx_gsl_prob \ -lvx_color \ diff --git a/src/tools/core/series_analysis/Makefile.am b/src/tools/core/series_analysis/Makefile.am index 6681bf63de..4dbab78623 100644 --- a/src/tools/core/series_analysis/Makefile.am +++ b/src/tools/core/series_analysis/Makefile.am @@ -28,10 +28,10 @@ series_analysis_LDADD = -lvx_stat_out \ -lvx_data2d_nccf \ -lvx_statistics \ -lvx_data2d \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ - -lvx_seeps \ -lvx_config \ -lvx_cal \ -lvx_util_math \ diff --git a/src/tools/core/series_analysis/Makefile.in b/src/tools/core/series_analysis/Makefile.in index 0b8493b157..d1e066eae0 100644 --- a/src/tools/core/series_analysis/Makefile.in +++ b/src/tools/core/series_analysis/Makefile.in @@ -336,10 +336,10 @@ series_analysis_LDADD = -lvx_stat_out \ -lvx_data2d_nccf \ -lvx_statistics \ -lvx_data2d \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ - -lvx_seeps \ -lvx_config \ -lvx_cal \ -lvx_util_math \ diff --git a/src/tools/core/stat_analysis/Makefile.am b/src/tools/core/stat_analysis/Makefile.am index 0949473aab..7d2198fc5e 100644 --- a/src/tools/core/stat_analysis/Makefile.am +++ b/src/tools/core/stat_analysis/Makefile.am @@ -31,10 +31,10 @@ stat_analysis_LDADD = -lvx_stat_out \ -lvx_data2d_nccf \ -lvx_statistics \ -lvx_data2d \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ - -lvx_seeps \ -lvx_config \ -lvx_time_series \ -lvx_pb_util \ diff --git a/src/tools/core/stat_analysis/Makefile.in b/src/tools/core/stat_analysis/Makefile.in index fb6bd3781a..cf531b2d07 100644 --- a/src/tools/core/stat_analysis/Makefile.in +++ b/src/tools/core/stat_analysis/Makefile.in @@ -344,10 +344,10 @@ stat_analysis_LDADD = -lvx_stat_out \ -lvx_data2d_nccf \ -lvx_statistics \ -lvx_data2d \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ - -lvx_seeps \ -lvx_config \ -lvx_time_series \ -lvx_pb_util \ diff --git a/src/tools/core/wavelet_stat/Makefile.am b/src/tools/core/wavelet_stat/Makefile.am index f5c836affd..1f9caafbe3 100644 --- a/src/tools/core/wavelet_stat/Makefile.am +++ b/src/tools/core/wavelet_stat/Makefile.am @@ -34,10 +34,10 @@ wavelet_stat_LDADD = -lvx_pxm \ -lvx_data2d_nccf \ -lvx_statistics \ -lvx_data2d \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ - -lvx_seeps \ -lvx_config \ -lvx_cal \ -lvx_util_math \ diff --git a/src/tools/core/wavelet_stat/Makefile.in b/src/tools/core/wavelet_stat/Makefile.in index 757c040f8f..86f163f0b8 100644 --- a/src/tools/core/wavelet_stat/Makefile.in +++ b/src/tools/core/wavelet_stat/Makefile.in @@ -341,10 +341,10 @@ wavelet_stat_LDADD = -lvx_pxm \ -lvx_data2d_nccf \ -lvx_statistics \ -lvx_data2d \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ - -lvx_seeps \ -lvx_config \ -lvx_cal \ -lvx_util_math \ diff --git a/src/tools/other/gen_ens_prod/Makefile.am b/src/tools/other/gen_ens_prod/Makefile.am index de1913ed11..a67d8f72c5 100644 --- a/src/tools/other/gen_ens_prod/Makefile.am +++ b/src/tools/other/gen_ens_prod/Makefile.am @@ -28,10 +28,10 @@ gen_ens_prod_LDADD = -lvx_stat_out \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ - -lvx_seeps \ -lvx_config \ -lvx_color \ -lvx_util_math \ diff --git a/src/tools/other/gen_ens_prod/Makefile.in b/src/tools/other/gen_ens_prod/Makefile.in index f89cc6b0d4..a569327ee7 100644 --- a/src/tools/other/gen_ens_prod/Makefile.in +++ b/src/tools/other/gen_ens_prod/Makefile.in @@ -335,10 +335,10 @@ gen_ens_prod_LDADD = -lvx_stat_out \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ - -lvx_seeps \ -lvx_config \ -lvx_color \ -lvx_util_math \ diff --git a/src/tools/other/gsi_tools/Makefile.am b/src/tools/other/gsi_tools/Makefile.am index 7f4f5acdf5..653582b255 100644 --- a/src/tools/other/gsi_tools/Makefile.am +++ b/src/tools/other/gsi_tools/Makefile.am @@ -46,10 +46,10 @@ gsid2mpr_LDADD = -lvx_stat_out \ -lvx_data2d_nccf \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ - -lvx_seeps \ -lvx_config \ -lvx_gsl_prob \ -lvx_cal \ @@ -93,10 +93,10 @@ gsidens2orank_LDADD = -lvx_stat_out \ -lvx_data2d_nccf \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ - -lvx_seeps \ -lvx_config \ -lvx_gsl_prob \ -lvx_cal \ diff --git a/src/tools/other/gsi_tools/Makefile.in b/src/tools/other/gsi_tools/Makefile.in index 550b454f44..f4f846b2c6 100644 --- a/src/tools/other/gsi_tools/Makefile.in +++ b/src/tools/other/gsi_tools/Makefile.in @@ -386,10 +386,10 @@ gsid2mpr_LDADD = -lvx_stat_out \ -lvx_data2d_nccf \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ - -lvx_seeps \ -lvx_config \ -lvx_gsl_prob \ -lvx_cal \ @@ -434,10 +434,10 @@ gsidens2orank_LDADD = -lvx_stat_out \ -lvx_data2d_nccf \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ - -lvx_seeps \ -lvx_config \ -lvx_gsl_prob \ -lvx_cal \ diff --git a/src/tools/tc_utils/tc_gen/Makefile.am b/src/tools/tc_utils/tc_gen/Makefile.am index 7f739ade46..f66a1577ef 100644 --- a/src/tools/tc_utils/tc_gen/Makefile.am +++ b/src/tools/tc_utils/tc_gen/Makefile.am @@ -30,10 +30,10 @@ tc_gen_LDADD = -lvx_stat_out \ -lvx_statistics \ -lvx_gis \ -lvx_data2d \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ - -lvx_seeps \ -lvx_config \ -lvx_pb_util \ -lvx_cal \ diff --git a/src/tools/tc_utils/tc_stat/Makefile.am b/src/tools/tc_utils/tc_stat/Makefile.am index 02b7d39821..6274b7985c 100644 --- a/src/tools/tc_utils/tc_stat/Makefile.am +++ b/src/tools/tc_utils/tc_stat/Makefile.am @@ -31,10 +31,10 @@ tc_stat_LDADD = -lvx_stat_out \ -lvx_data2d_nccf \ -lvx_statistics \ -lvx_data2d \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ - -lvx_seeps \ -lvx_config \ -lvx_gsl_prob \ -lvx_pb_util \ From a092e73701ab3e5f0b4876f1c48e9754dd856b87 Mon Sep 17 00:00:00 2001 From: jprestop Date: Mon, 10 Oct 2022 16:31:51 -0600 Subject: [PATCH 3/3] Updating value for yystate --- src/basic/vx_config/config.tab.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/basic/vx_config/config.tab.cc b/src/basic/vx_config/config.tab.cc index 43fe74766f..5b67009f59 100644 --- a/src/basic/vx_config/config.tab.cc +++ b/src/basic/vx_config/config.tab.cc @@ -1389,7 +1389,7 @@ yyparse (void) YYDPRINTF ((stderr, "Starting parse\n")); - yystate = 0; + yystate = 8; yyerrstatus = 0; yynerrs = 0; yychar = YYEMPTY; /* Cause a token to be read. */