Bug 1733374 - land NSS NSS_3_72_BETA1 UPGRADE_NSS_RELEASE, r=bbeurdouche

``` 2021-10-19 Giulio Benetti <[email protected]> * coreconf/rules.mk: Bug 1731911 - Fix nsinstall parallel failure r=nss- reviewers,djackson [f7b146b603f7] [NSS_3_72_BETA1] ``` Differential Revision: https://phabricator.services.mozilla.com/D129242
dothq · Oct 22, 2021 · 1ee4311 · 1ee4311
1 parent 920a666
commit 1ee4311
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/security/nss/TAG-INFO b/security/nss/TAG-INFO
@@ -1 +1 @@
-de3db3a55aef
+NSS_3_72_BETA1
diff --git a/security/nss/coreconf/coreconf.dep b/security/nss/coreconf/coreconf.dep
@@ -10,4 +10,3 @@
  */
 
 #error "Do not include this header file."
-
diff --git a/security/nss/coreconf/rules.mk b/security/nss/coreconf/rules.mk
@@ -377,6 +377,8 @@ $(3)/%: %
 	$$(INSTALL) -m 444 $$^ $(3)
 
 $(1): $$(addprefix $(3)/,$$($(2))) | $(3)/d
+
+.NOTPARALLEL: $(1)
 endif
 else
 $(1):
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,4 +10,3 @@
		*/

		#error "Do not include this header file."
-Original file line number
+Diff line change
@@ Expand Up / @@ -377,6 +377,8 @@ $(3)/%: % @@
     	$$(INSTALL) -m 444 $$^ $(3)
     $(1): $$(addprefix $(3)/,$$($(2))) | $(3)/d
+    .NOTPARALLEL: $(1)
     endif
     else
     $(1):
@@ Expand Down @@