Skip to contentSkip to conversation

rust: Delete python2 configparser code path

PATCH New Alex Kiernan 1 participant 2 messages Nov 24, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 rust: Delete python2 configparser code path

We no longer support python2, remove the python2 fallback code.

---

 meta/recipes-devtools/rust/rust_1.70.0.bb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
meta/recipes-devtools/rust/rust_1.70.0.bb +1 -4
index 16d433910f8e..2e34b3de1c45 100644
@@ -72,10 +72,7 @@ do_rust_setup_snapshot[vardepsexclude] += "UNINATIVE_LOADER"
 
 python do_configure() {
     import json
-    try:
-        import configparser
-    except ImportError:
-        import ConfigParser as configparser
+    import configparser
 
     # toml is rather similar to standard ini like format except it likes values
     # that look more JSON like. So for our purposes simply escaping all values
Signature · 1 line
2.39.0
#1 lore raw

PATCH 2/2 rust: Drop TARGET_VENDOR export

This was used by crossbeam_atomic.patch, but that patch was removed as part of the 1.69.0 upgrade.

---

 meta/recipes-devtools/rust/rust-source.inc | 3 ---
 1 file changed, 3 deletions(-)
meta/recipes-devtools/rust/rust-source.inc +0 -3
index 4a720e645bf4..7a0790f6b62c 100644
@@ -12,8 +12,5 @@ SRC_URI[rust.sha256sum] = "bb8e9c564566b2d3228d95de9063a9254182446a161353f1d843b
 
 RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"
 
-# Used by crossbeam_atomic.patch
-export TARGET_VENDOR
-
 UPSTREAM_CHECK_URI = "https://forge.rust-lang.org/infra/other-installation-methods.html"
 UPSTREAM_CHECK_REGEX = "rustc-(?P<pver>\d+(\.\d+)+)-src"
Signature · 1 line
2.39.0