Skip to content

Commit 5ca934f

Browse files
authored
Merge pull request #495 from climbfuji/feature/libirc_parallel_netcdf_and_scipy
Bug fix in parallel-netcdf to avoid linking to libirc.so AND cherry-pick spack develop PR 48251 (conflict Intel Classic with scipy@1.14)
2 parents c17cb31 + 48e93e4 commit 5ca934f

File tree

2 files changed

+41
-27
lines changed

2 files changed

+41
-27
lines changed

var/spack/repos/builtin/packages/parallel-netcdf/package.py

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,22 @@ def url_for_version(self, version):
3737

3838
version("master", branch="master")
3939
version("1.12.3", sha256="439e359d09bb93d0e58a6e3f928f39c2eae965b6c97f64e67cd42220d6034f77")
40-
version("1.12.2", sha256="3ef1411875b07955f519a5b03278c31e566976357ddfc74c2493a1076e7d7c74")
41-
version("1.12.1", sha256="56f5afaa0ddc256791c405719b6436a83b92dcd5be37fe860dea103aee8250a2")
42-
version("1.11.2", sha256="d2c18601b364c35b5acb0a0b46cd6e14cae456e0eb854e5c789cf65f3cd6a2a7")
43-
version("1.11.1", sha256="0c587b707835255126a23c104c66c9614be174843b85b897b3772a590be45779")
44-
version("1.11.0", sha256="a18a1a43e6c4fd7ef5827dbe90e9dcf1363b758f513af1f1356ed6c651195a9f")
45-
version("1.10.0", sha256="ed189228b933cfeac3b7b4f8944eb00e4ff2b72cf143365b1a77890980663a09")
46-
version("1.9.0", sha256="356e1e1fae14bc6c4236ec11435cfea0ff6bde2591531a4a329f9508a01fbe98")
47-
version("1.8.1", sha256="8d7d4c9c7b39bb1cbbcf087e0d726551c50f0cc30d44aed3df63daf3772c9043")
48-
version("1.8.0", sha256="ac00bb2333bee96354de9d9c32d3dfdaa919d878098762f146996578b7f0ede9")
49-
version("1.7.0", sha256="52f0d106c470a843c6176318141f74a21e6ece3f70ee8fe261c6b93e35f70a94")
50-
version("1.6.1", sha256="8cf1af7b640475e3cc931e5fbcfe52484c5055f2fab526691933c02eda388aae")
40+
with default_args(deprecated=True):
41+
version(
42+
"1.12.2", sha256="3ef1411875b07955f519a5b03278c31e566976357ddfc74c2493a1076e7d7c74"
43+
)
44+
version(
45+
"1.12.1", sha256="56f5afaa0ddc256791c405719b6436a83b92dcd5be37fe860dea103aee8250a2"
46+
)
47+
version(
48+
"1.11.2", sha256="d2c18601b364c35b5acb0a0b46cd6e14cae456e0eb854e5c789cf65f3cd6a2a7"
49+
)
50+
version(
51+
"1.11.1", sha256="0c587b707835255126a23c104c66c9614be174843b85b897b3772a590be45779"
52+
)
53+
version(
54+
"1.11.0", sha256="a18a1a43e6c4fd7ef5827dbe90e9dcf1363b758f513af1f1356ed6c651195a9f"
55+
)
5156

5257
depends_on("c", type="build") # generated
5358
depends_on("cxx", type="build") # generated
@@ -68,22 +73,9 @@ def url_for_version(self, version):
6873

6974
depends_on("perl", type="build")
7075

71-
# Suport for shared libraries was introduced in version 1.9.0
72-
conflicts("+shared", when="@:1.8")
73-
conflicts("+burstbuffer", when="@:1.10")
74-
75-
# Before 1.10.0, C utility programs (e.g. ncmpigen) were linked without
76-
# explicit specification of the Fortran runtime libraries, which is
77-
# required when libpnetcdf.so contains Fortran symbols. Libtool sets the
78-
# required linking flags implicitly but only if the Fortran compiler
79-
# produces verbose output with the '-v' flag (and, due to a bug in Libtool,
80-
# when CXX is not set to 'no'; see macro _LT_LANG_FC_CONFIG in libtool.m4
81-
# for more details). The latter is not the case for NAG. Starting 1.10.0,
82-
# the required linking flags are explicitly set in the makefiles and
83-
# detected using macro AC_FC_LIBRARY_LDFLAGS, which means that we can
84-
# override the verbose output flag for Fortran compiler on the command line
85-
# (see below).
86-
conflicts("+shared", when="@:1.9%nag+fortran")
76+
# https://github.com/JCSDA/spack-stack/issues/1436
77+
patch("parallel-netcdf-1.12.3-intel-irc-intlc.patch", when="@1.12.3 %intel")
78+
patch("parallel-netcdf-1.12.3-intel-irc-intlc.patch", when="@1.12.3 %oneapi")
8779

8880
@property
8981
def libs(self):
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
--- a/configure 2024-12-23 18:30:28.919868886 +0000
2+
+++ b/configure 2024-12-23 18:34:25.317866633 +0000
3+
@@ -23603,6 +23603,9 @@
4+
;;
5+
-[lLR]*)
6+
ac_exists=false
7+
+ if test x"$ac_arg" = x"-lirc"; then
8+
+ ac_arg="-lintlc"
9+
+ fi
10+
for ac_i in $ac_cv_f77_libs; do
11+
if test x"$ac_arg" = x"$ac_i"; then
12+
ac_exists=true
13+
@@ -27343,6 +27346,9 @@
14+
;;
15+
-[lLR]*)
16+
ac_exists=false
17+
+ if test x"$ac_arg" = x"-lirc"; then
18+
+ ac_arg="-lintlc"
19+
+ fi
20+
for ac_i in $ac_cv_fc_libs; do
21+
if test x"$ac_arg" = x"$ac_i"; then
22+
ac_exists=true

0 commit comments

Comments
 (0)