qthreads package: make hwloc dependency optional and add version 1.14 (#11780)
This commit is contained in:
		 Carson Woods
					Carson Woods
				
			
				
					committed by
					
						 Peter Scheibel
						Peter Scheibel
					
				
			
			
				
	
			
			
			 Peter Scheibel
						Peter Scheibel
					
				
			
						parent
						
							5e9437866b
						
					
				
				
					commit
					5873beb83f
				
			| @@ -20,6 +20,7 @@ class Qthreads(AutotoolsPackage): | |||||||
|     homepage = "http://www.cs.sandia.gov/qthreads/" |     homepage = "http://www.cs.sandia.gov/qthreads/" | ||||||
|  |  | ||||||
|     url = "https://github.com/Qthreads/qthreads/releases/download/1.10/qthread-1.10.tar.bz2" |     url = "https://github.com/Qthreads/qthreads/releases/download/1.10/qthread-1.10.tar.bz2" | ||||||
|  |     version("1.14", "3e6eb58baf78dc961b19a37b2dc4f9a5") | ||||||
|     version("1.12", "c857d175f8135eaa669f3f8fa0fb0c09") |     version("1.12", "c857d175f8135eaa669f3f8fa0fb0c09") | ||||||
|     version("1.11", "68b5f9a41cfd1a2ac112cc4db0612326") |     version("1.11", "68b5f9a41cfd1a2ac112cc4db0612326") | ||||||
|     version("1.10", "d1cf3cf3f30586921359f7840171e551") |     version("1.10", "d1cf3cf3f30586921359f7840171e551") | ||||||
| @@ -27,12 +28,21 @@ class Qthreads(AutotoolsPackage): | |||||||
|     patch("restrict.patch", when="@:1.10") |     patch("restrict.patch", when="@:1.10") | ||||||
|     patch("trap.patch", when="@:1.10") |     patch("trap.patch", when="@:1.10") | ||||||
|  |  | ||||||
|     depends_on("hwloc") |     variant( | ||||||
|  |         'hwloc', | ||||||
|  |         default=True, | ||||||
|  |         description='hwloc support' | ||||||
|  |     ) | ||||||
|  |  | ||||||
|  |     depends_on("hwloc@1.0:1.99", when="+hwloc") | ||||||
|  |  | ||||||
|     def configure_args(self): |     def configure_args(self): | ||||||
|         spec = self.spec |         spec = self.spec | ||||||
|  |         if "+hwloc" in self.spec: | ||||||
|             args = [ |             args = [ | ||||||
|                 "--enable-guard-pages", |                 "--enable-guard-pages", | ||||||
|                 "--with-topology=hwloc", |                 "--with-topology=hwloc", | ||||||
|                 "--with-hwloc=%s" % spec["hwloc"].prefix] |                 "--with-hwloc=%s" % spec["hwloc"].prefix] | ||||||
|  |         else: | ||||||
|  |             args = ["--with-topology=no"] | ||||||
|         return args |         return args | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user