soapdenovo2: strip optimization flags from injected flags (#38846)
* soapdenovo2: strip optimization flags from injected flags * soapdenovo2: add maintainer * soapdenovo2: only append on cflags * soapdenovo2: clean up some wording and implementation
This commit is contained in:
		| @@ -3,6 +3,8 @@ | |||||||
| # | # | ||||||
| # SPDX-License-Identifier: (Apache-2.0 OR MIT) | # SPDX-License-Identifier: (Apache-2.0 OR MIT) | ||||||
| 
 | 
 | ||||||
|  | import re | ||||||
|  | 
 | ||||||
| from spack.package import * | from spack.package import * | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| @@ -15,16 +17,19 @@ class Soapdenovo2(MakefilePackage): | |||||||
| 
 | 
 | ||||||
|     homepage = "https://github.com/aquaskyline/SOAPdenovo2" |     homepage = "https://github.com/aquaskyline/SOAPdenovo2" | ||||||
|     url = "https://github.com/aquaskyline/SOAPdenovo2/archive/r240.tar.gz" |     url = "https://github.com/aquaskyline/SOAPdenovo2/archive/r240.tar.gz" | ||||||
|  |     maintainers("snehring") | ||||||
| 
 | 
 | ||||||
|     version("242", sha256="a0043ceb41bc17a1c3fd2b8abe4f9029a60ad3edceb2b15af3c2cfabd36aa11b") |     version("242", sha256="a0043ceb41bc17a1c3fd2b8abe4f9029a60ad3edceb2b15af3c2cfabd36aa11b") | ||||||
|     version("240", sha256="cc9e9f216072c0bbcace5efdead947e1c3f41f09baec5508c7b90f933a090909") |     version("240", sha256="cc9e9f216072c0bbcace5efdead947e1c3f41f09baec5508c7b90f933a090909") | ||||||
| 
 | 
 | ||||||
|     def flag_handler(self, name, flags): |     def flag_handler(self, name, flags): | ||||||
|         if self.spec.satisfies("%gcc@10:"): |         if name.lower() == "cflags" and self.spec.satisfies("%gcc@10:"): | ||||||
|             if name == "cflags" or name == "CFLAGS": |             flags.append("-fcommon") | ||||||
|                 flags.append("-fcommon") |         if name.lower() in ["cflags", "cxxflags", "cppflags"]: | ||||||
|             if name == "cxxflags" or name == "CXXFLAGS": |             opt_flag = re.compile("-O.*") | ||||||
|                 flags.append("-fcommon") |             # This package cannot compile with any optimization flag other | ||||||
|  |             # than the -O3 specified in the makefile | ||||||
|  |             flags = [f for f in flags if not opt_flag.match(f)] | ||||||
|         return (flags, None, None) |         return (flags, None, None) | ||||||
| 
 | 
 | ||||||
|     def install(self, spec, prefix): |     def install(self, spec, prefix): | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 snehring
					snehring