From 1883fedae76ac41023a3693881bbafefd888a34b Mon Sep 17 00:00:00 2001
From: Douglas Thain <dthain@nd.edu>
Date: Mon, 9 May 2022 13:50:00 -0400
Subject: cctools: add 7.4.2 (#28766)

* Update to cctools-7.4.2
* Add simple patch to remove broken test cases.
* import unlink
* add maintainers
---
 var/spack/repos/builtin/packages/cctools/package.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'var')

diff --git a/var/spack/repos/builtin/packages/cctools/package.py b/var/spack/repos/builtin/packages/cctools/package.py
index 5c67ec9511..c2f2f68975 100644
--- a/var/spack/repos/builtin/packages/cctools/package.py
+++ b/var/spack/repos/builtin/packages/cctools/package.py
@@ -3,6 +3,8 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+import os
+
 from spack import *
 
 
@@ -13,8 +15,10 @@ class Cctools(AutotoolsPackage):
     """
 
     homepage = "https://cctools.readthedocs.io"
-    url      = "https://ccl.cse.nd.edu/software/files/cctools-7.2.4-source.tar.gz"
+    url      = "https://ccl.cse.nd.edu/software/files/cctools-7.4.2-source.tar.gz"
+    maintainers = ['dthain', 'btovar']
 
+    version('7.4.2', sha256='7c8c86f09bcb9ad23ab44e52dfb5bf3a4e4a1ad84ef51e500a9c8c2371770f4b')
     version('7.2.10', sha256='4a604329896ae5e0fad7451a3814f531ff2f00a41c96e971ac08276208aa1650')
     version('7.2.4', sha256='36d36465a14b503a27c4739ebe0e11e00970ef6abb07c0365a46670753dddbd0')
     version('7.2.3', sha256='c9d32f9e9d4886ef88b79cc7c898c26e8369a004132080697b8523560cb8765b')
@@ -56,6 +60,16 @@ class Cctools(AutotoolsPackage):
             for m in makefiles:
                 filter_file('-fstack-protector-all', '', m)
 
+        # Remove two troublesome test cases:
+
+        # TR_parrot_dir.sh fails b/c of variations in how Linux kernels
+        # deal with open() on directories.
+        os.unlink("parrot/test/TR_parrot_dir.sh")
+
+        # TR_parrot_execve.sh fails b/c of the complexities of moving
+        # a python interpreter around.
+        os.unlink("parrot/test/TR_parrot_execve.sh")
+
     def configure_args(self):
         args = []
 
-- 
cgit v1.2.3-70-g09d2