Ensure iOS platform tags are correctly normalized.

freakboy3742 · freakboy3742 · commit 5d567de48de3 · 2024-09-24T17:38:56.000-07:00
diff --git a/src/pip/_vendor/packaging/tags.py b/src/pip/_vendor/packaging/tags.py
@@ -505,6 +505,7 @@ def ios_platforms(
 
     if multiarch is None:
         multiarch = sys.implementation._multiarch
+    multiarch = multiarch.replace("-", "_")
 
     ios_platform_template = "ios_{major}_{minor}_{multiarch}"
 
diff --git a/tools/vendoring/patches/packaging.patch b/tools/vendoring/patches/packaging.patch
@@ -47,7 +47,7 @@ index 6667d2990..bcc6ea041 100644
      else:
          version = version
      if arch is None:
-@@ -483,6 +483,57 @@ def mac_platforms(
+@@ -483,6 +483,58 @@ def mac_platforms(
                  )
 
 
@@ -73,6 +73,7 @@ index 6667d2990..bcc6ea041 100644
 +
 +    if multiarch is None:
 +        multiarch = sys.implementation._multiarch
++    multiarch = multiarch.replace("-", "_")
 +
 +    ios_platform_template = "ios_{major}_{minor}_{multiarch}"
 +

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ index 6667d2990..bcc6ea041 100644`
`47`	`47`	`else:`
`48`	`48`	`version = version`
`49`	`49`	`if arch is None:`
`50`		`-@@ -483,6 +483,57 @@ def mac_platforms(`
	`50`	`+@@ -483,6 +483,58 @@ def mac_platforms(`
`51`	`51`	`)`
`52`	`52`
`53`	`53`
`@@ -73,6 +73,7 @@ index 6667d2990..bcc6ea041 100644`
`73`	`73`	`+`
`74`	`74`	`+ if multiarch is None:`
`75`	`75`	`+ multiarch = sys.implementation._multiarch`
	`76`	`++ multiarch = multiarch.replace("-", "_")`
`76`	`77`	`+`
`77`	`78`	`+ ios_platform_template = "ios_{major}_{minor}_{multiarch}"`
`78`	`79`	`+`