bump: nss + dep (#35294)
This commit is contained in:
		| @@ -15,6 +15,7 @@ class Nspr(AutotoolsPackage): | |||||||
|     ) |     ) | ||||||
|     url = "https://ftp.mozilla.org/pub/nspr/releases/v4.13.1/src/nspr-4.13.1.tar.gz" |     url = "https://ftp.mozilla.org/pub/nspr/releases/v4.13.1/src/nspr-4.13.1.tar.gz" | ||||||
| 
 | 
 | ||||||
|  |     version("4.35", sha256="7ea3297ea5969b5d25a5dd8d47f2443cda88e9ee746301f6e1e1426f8a6abc8f") | ||||||
|     version("4.32", sha256="bb6bf4f534b9559cf123dcdc6f9cd8167de950314a90a88b2a329c16836e7f6c") |     version("4.32", sha256="bb6bf4f534b9559cf123dcdc6f9cd8167de950314a90a88b2a329c16836e7f6c") | ||||||
|     version("4.31", sha256="5729da87d5fbf1584b72840751e0c6f329b5d541850cacd1b61652c95015abc8") |     version("4.31", sha256="5729da87d5fbf1584b72840751e0c6f329b5d541850cacd1b61652c95015abc8") | ||||||
|     version("4.13.1", sha256="5e4c1751339a76e7c772c0c04747488d7f8c98980b434dc846977e43117833ab") |     version("4.13.1", sha256="5e4c1751339a76e7c772c0c04747488d7f8c98980b434dc846977e43117833ab") | ||||||
|   | |||||||
| @@ -16,6 +16,7 @@ class Nss(MakefilePackage): | |||||||
|     homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" |     homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" | ||||||
|     url = "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_67_RTM/src/nss-3.67.tar.gz" |     url = "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_67_RTM/src/nss-3.67.tar.gz" | ||||||
| 
 | 
 | ||||||
|  |     version("3.87", sha256="68a1894496d3d158babc75f8a5dda3f55b7c1560573936e3b101a10fa4ac152d") | ||||||
|     version("3.75", sha256="fd571507827284644f4dd522a032acda2286835f6683ed22a1c2d3878cc58582") |     version("3.75", sha256="fd571507827284644f4dd522a032acda2286835f6683ed22a1c2d3878cc58582") | ||||||
|     version("3.73", sha256="566d3a68da9b10d7da9ef84eb4fe182f8f04e20d85c55d1bf360bb2c0096d8e5") |     version("3.73", sha256="566d3a68da9b10d7da9ef84eb4fe182f8f04e20d85c55d1bf360bb2c0096d8e5") | ||||||
|     # Everything before 3.73 is vulnerable (CVE-2021-43527) |     # Everything before 3.73 is vulnerable (CVE-2021-43527) | ||||||
| @@ -43,18 +44,20 @@ def build_targets(self): | |||||||
|         # We cannot use nss_build_all because this will try to build nspr. |         # We cannot use nss_build_all because this will try to build nspr. | ||||||
|         targets = ["all", "latest"] |         targets = ["all", "latest"] | ||||||
| 
 | 
 | ||||||
|         targets.append("CCC={}".format(spack_cxx)) |         targets.extend( | ||||||
|         targets.append("USE_64=1") |             [ | ||||||
|         targets.append("BUILD_OPT=1") |                 "CCC={}".format(spack_cxx), | ||||||
|  |                 "USE_64=1", | ||||||
|  |                 "BUILD_OPT=1", | ||||||
|  |                 "NSS_USE_SYSTEM_SQLITE=1", | ||||||
|  |                 "NSS_ENABLE_WERROR=0", | ||||||
|  |                 "NSS_DISABLE_GTESTS=1", | ||||||
|  |             ] | ||||||
|  |         ) | ||||||
| 
 | 
 | ||||||
|         for var in ("DIST", "SOURCE_PREFIX", "SOURCE_MD_DIR"): |         for var in ("DIST", "SOURCE_PREFIX", "SOURCE_MD_DIR"): | ||||||
|             targets.append("{0}={1}".format(var, join_path(self.stage.source_path, "dist"))) |             targets.append("{0}={1}".format(var, join_path(self.stage.source_path, "dist"))) | ||||||
| 
 | 
 | ||||||
|         targets.append("NSS_USE_SYSTEM_SQLITE=1") |  | ||||||
| 
 |  | ||||||
|         if self.spec.satisfies("%gcc@10:"): |  | ||||||
|             targets.append("NSS_ENABLE_WERROR=0") |  | ||||||
| 
 |  | ||||||
|         return targets |         return targets | ||||||
| 
 | 
 | ||||||
|     def install(self, spec, prefix): |     def install(self, spec, prefix): | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Harmen Stoppels
					Harmen Stoppels