zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

netcdf-c: prevent overlinking to a system installation of libcurl (#28537)

Browse Source
This commit is contained in:
Sergey Kosukhin 2022-04-19 17:26:33 +02:00 committed by GitHub
parent 823b982ee1
commit a4f32dbf8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
var/spack/repos/builtin/packages/netcdf-c/package.py
View File

@ -3,6 +3,8 @@
# #
# SPDX-License-Identifier: (Apache-2.0 OR MIT) # SPDX-License-Identifier: (Apache-2.0 OR MIT)
import os
from spack import * from spack import *
@ -17,7 +19,7 @@ class NetcdfC(AutotoolsPackage):
maintainers = ['skosukhin', 'WardF'] maintainers = ['skosukhin', 'WardF']
version('master', branch='master') version('main', branch='main')
version('4.8.1', sha256='bc018cc30d5da402622bf76462480664c6668b55eb16ba205a0dfb8647161dd0') version('4.8.1', sha256='bc018cc30d5da402622bf76462480664c6668b55eb16ba205a0dfb8647161dd0')
version('4.8.0', sha256='aff58f02b1c3e91dc68f989746f652fe51ff39e6270764e484920cb8db5ad092') version('4.8.0', sha256='aff58f02b1c3e91dc68f989746f652fe51ff39e6270764e484920cb8db5ad092')
version('4.7.4', sha256='99930ad7b3c4c1a8e8831fb061cb02b2170fc8e5ccaeda733bd99c3b9d31666b') version('4.7.4', sha256='99930ad7b3c4c1a8e8831fb061cb02b2170fc8e5ccaeda733bd99c3b9d31666b')
@ -78,9 +80,9 @@ class NetcdfC(AutotoolsPackage):
# description='Enable CDM Remote support') # description='Enable CDM Remote support')
# The patch for 4.7.0 touches configure.ac. See force_autoreconf below. # The patch for 4.7.0 touches configure.ac. See force_autoreconf below.
depends_on('autoconf', type='build', when='@4.7.0') depends_on('autoconf', type='build', when='@4.7.0,main')
depends_on('automake', type='build', when='@4.7.0') depends_on('automake', type='build', when='@4.7.0,main')
depends_on('libtool', type='build', when='@4.7.0') depends_on('libtool', type='build', when='@4.7.0,main')
depends_on("m4", type='build') depends_on("m4", type='build')
depends_on("hdf~netcdf", when='+hdf4') depends_on("hdf~netcdf", when='+hdf4')
@ -131,6 +133,11 @@ def force_autoreconf(self):
# The patch for 4.7.0 touches configure.ac. # The patch for 4.7.0 touches configure.ac.
return self.spec.satisfies('@4.7.0') return self.spec.satisfies('@4.7.0')
@when('@4.6.3:')
def autoreconf(self, spec, prefix):
if not os.path.exists(self.configure_abs_path):
Executable('./bootstrap')()
def configure_args(self): def configure_args(self):
cflags = [] cflags = []
cppflags = [] cppflags = []
@ -170,6 +177,9 @@ def configure_args(self):
ldflags.append(curl_libs.search_flags) ldflags.append(curl_libs.search_flags)
# TODO: figure out how to get correct flags via headers.cpp_flags # TODO: figure out how to get correct flags via headers.cpp_flags
cppflags.append('-I' + curl.prefix.include) cppflags.append('-I' + curl.prefix.include)
elif self.spec.satisfies('@4.8.0:'):
# Prevent overlinking to a system installation of libcurl:
config_args.append('ac_cv_lib_curl_curl_easy_setopt=no')
if self.spec.satisfies('@4.4:'): if self.spec.satisfies('@4.4:'):
if '+mpi' in self.spec: if '+mpi' in self.spec: