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

libxml2: fix building with nvhpc (#32440)

Browse Source
This commit is contained in:
Harmen Stoppels 2022-08-30 14:13:47 +02:00 committed by GitHub
parent 43ae15a887
commit 33cb61afb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
var/spack/repos/builtin/packages/libxml2/nvhpc-configure.patch
View File

@ -1,34 +0,0 @@
--- a/configure 2020-08-24 14:05:58.117448257 -0700
+++ b/configure 2020-08-24 14:08:33.040348242 -0700
@@ -9184,7 +9184,7 @@
lt_prog_compiler_pic='-fPIC'
lt_prog_compiler_static='-static'
;;
- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran* | nvc | nvfortran*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
lt_prog_compiler_wl='-Wl,'
@@ -9226,7 +9226,7 @@
lt_prog_compiler_pic='-fPIC'
lt_prog_compiler_static='-static'
;;
- *Portland\ Group*)
+ *Portland\ Group* | *NVIDIA\ Compilers* | *PGI\ Compilers*)
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-fpic'
lt_prog_compiler_static='-Bstatic'
@@ -9823,11 +9823,11 @@
tmp_addflag=' $pic_flag'
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
- pgcc*) # Portland Group C compiler
+ pgcc* | nvc) # Portland Group C compiler
whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
- pgf77* | pgf90* | pgf95* | pgfortran*)
+ pgf77* | pgf90* | pgf95* | pgfortran* | nvfortran*)
# Portland Group f77 and f90 compilers
whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
tmp_addflag=' $pic_flag -Mnomain' ;;

3
var/spack/repos/builtin/packages/libxml2/package.py
View File

@ -59,8 +59,7 @@ def url_for_version(self, version):
sha256="96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7",
)
patch("nvhpc-configure.patch", when="%nvhpc")
patch("nvhpc-elfgcchack.patch", when="%nvhpc")
patch("nvhpc-elfgcchack.patch", when="@:2.9 %nvhpc")
# Use NAN/INFINITY if available to avoid SIGFPE
# See https://gitlab.gnome.org/GNOME/libxml2/-/merge_requests/186