Skip to content

Commit 607f446

Browse files
author
meihuisu
committed
netcdf's tarball came with full configure/autotool files and so skip
boostrapping in ucvm_setup.py
1 parent 719839f commit 607f446

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

setup/setup.list

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,13 +434,13 @@
434434
},
435435
"NetCDF": {
436436
"Path": "netcdf",
437+
"Note": "src tarball contains a working configure script and libtool ecosystem, skip bootstrapping",
437438
"Lib": "netcdf-c-4.9.2",
438439
"URL": "https://downloads.unidata.ucar.edu/netcdf-c/4.9.2/netcdf-c-4.9.2.tar.gz",
439440
"Required": "yes",
440441
"Libraries": ["hdf5"],
441442
"Prerequisites": "Dynamic",
442443
"ConfigureFlags": "--enable-shared --disable-static --enable-netcdf4 --disable-dap --disable-byterange --disable-doxygen CPPFLAGS='-I${UCVM_INSTALL_PATH}/lib/hdf5/include' LDFLAGS='-L${UCVM_INSTALL_PATH}/lib/hdf5/lib -Wl,-rpath,${UCVM_INSTALL_PATH}/lib/hdf5/lib' PKG_CONFIG_PATH='${UCVM_INSTALL_PATH}/lib/hdf5/lib/pkgconfig:${PKG_CONFIG_PATH}'",
443-
"oUCVMConfigureFlags": "--enable-netcdf --with-netcdf-include-path=${UCVM_INSTALL_PATH}/lib/netcdf/include --with-netcdf-lib-path=${UCVM_INSTALL_PATH}/lib/netcdf/lib",
444444
"UCVMConfigureFlags": "--with-netcdf-include-path=${UCVM_INSTALL_PATH}/lib/netcdf/include --with-netcdf-lib-path=${UCVM_INSTALL_PATH}/lib/netcdf/lib",
445445
"md5sum": "f48ee01534365006934f0c63d4055ea0",
446446
"Ask": "no",
@@ -462,6 +462,7 @@
462462
},
463463
"OpenSSL": {
464464
"Path": "openssl",
465+
"Note": "src tarball contains a working configure script and libtool ecosystem, skip bootstrapping",
465466
"Lib": "openssl-3.0.8",
466467
"Size": "33M",
467468
"URL": "https://g-3a9041.a78b8.36fe.data.globus.org/ucvm/v25_3/lib/openssl-3.0.8.tar.gz",

ucvm_setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,10 @@ def installConfigMakeInstall(tarname, ucvmpath, type, config_data):
238238

239239
libtoolize_list=["sfcvm","cvms5","cvmh","cs248","uwlinca"]
240240
autoreconf_list=["sfcvm","cca","cs248"]
241-
skip_conf_list = ["openssl"]
241+
skip_conf_list = ["openssl","netcdf"]
242242

243243
if config_data["Path"] in skip_conf_list :
244-
print("\nNo need to configure -- ", config_data["Path"]);
244+
print("\nNo need to boostrap autotools -- ", config_data["Path"]);
245245
else:
246246
if config_data["Path"] in libtoolize_list :
247247
print("\nRunning libtoolize")

0 commit comments

Comments
 (0)