From 33cb61afb9ab3fd13cc7f6cf930e6fc9319b2e75 Mon Sep 17 00:00:00 2001
From: Harmen Stoppels <harmenstoppels@gmail.com>
Date: Tue, 30 Aug 2022 14:13:47 +0200
Subject: libxml2: fix building with nvhpc (#32440)

---
 .../builtin/packages/libxml2/nvhpc-configure.patch | 34 ----------------------
 .../repos/builtin/packages/libxml2/package.py      |  3 +-
 2 files changed, 1 insertion(+), 36 deletions(-)
 delete mode 100644 var/spack/repos/builtin/packages/libxml2/nvhpc-configure.patch

(limited to 'var')

diff --git a/var/spack/repos/builtin/packages/libxml2/nvhpc-configure.patch b/var/spack/repos/builtin/packages/libxml2/nvhpc-configure.patch
deleted file mode 100644
index d2f04c8c73..0000000000
--- a/var/spack/repos/builtin/packages/libxml2/nvhpc-configure.patch
+++ /dev/null
@@ -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' ;;
diff --git a/var/spack/repos/builtin/packages/libxml2/package.py b/var/spack/repos/builtin/packages/libxml2/package.py
index 548b96ccb5..e72f73a1f7 100644
--- a/var/spack/repos/builtin/packages/libxml2/package.py
+++ b/var/spack/repos/builtin/packages/libxml2/package.py
@@ -59,8 +59,7 @@ class Libxml2(AutotoolsPackage):
         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
-- 
cgit v1.2.3-60-g2f50