mirror of
git://git.yoctoproject.org/poky
synced 2026-10-06 11:07:32 +00:00
75d5ff281a
(From OE-Core rev: d3e61ba2a73894e72b6a85f96df92fc33e97b0bb) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
56 lines
2.1 KiB
Diff
56 lines
2.1 KiB
Diff
From 672dca922397016720eae2a3f0fb79613971c56e Mon Sep 17 00:00:00 2001
|
|
From: Yoann Congal <yoann.congal@smile.fr>
|
|
Date: Thu, 17 Oct 2024 22:17:20 +0200
|
|
Subject: [PATCH] build_context: improve wheel reproducibility by sorting libs
|
|
(#2261)
|
|
|
|
OE-core note: Upstream does not have a commit message for this. Bellow
|
|
is the message I've sent:
|
|
> While tracking a reproducibility issue from maturin's output, we found
|
|
> that the .so file in the output .whl were not ordered the same
|
|
> every time.
|
|
>
|
|
> Order of the external libraries in the .whl comes down to the order
|
|
> `soname_map` is iterated. But, `std::HashMap` does not provide a stable
|
|
> order and that create an unstable order in the wheel.
|
|
>
|
|
> Switch to `std::BTreeMap` which keeps keys sorted and is iterable
|
|
> in a stable order.
|
|
>
|
|
> This can be tested by building current python3-cryptography :
|
|
> SOURCE_DATE_EPOCH=1728915855 maturin build
|
|
>
|
|
> Before this commit, the above give two possible outputs (~50% each), the
|
|
> difference is in the order of libssl and libcrypto.
|
|
>
|
|
> After this commit, the output is reproducible.
|
|
|
|
Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
|
|
Upstream-Status: Backport [https://github.com/PyO3/maturin/commit/61d54809776e1ca79ff8cc92387d70796d50c16e]
|
|
---
|
|
src/build_context.rs | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/build_context.rs b/src/build_context.rs
|
|
index a98d233..09ca090 100644
|
|
--- a/src/build_context.rs
|
|
+++ b/src/build_context.rs
|
|
@@ -24,7 +24,7 @@ use normpath::PathExt;
|
|
use pep508_rs::Requirement;
|
|
use platform_info::*;
|
|
use sha2::{Digest, Sha256};
|
|
-use std::collections::{HashMap, HashSet};
|
|
+use std::collections::{BTreeMap, HashSet};
|
|
use std::env;
|
|
use std::fmt::{Display, Formatter};
|
|
use std::io;
|
|
@@ -396,7 +396,7 @@ impl BuildContext {
|
|
writer.add_directory(&libs_dir)?;
|
|
|
|
let temp_dir = tempfile::tempdir()?;
|
|
- let mut soname_map = HashMap::new();
|
|
+ let mut soname_map = BTreeMap::new();
|
|
let mut libs_copied = HashSet::new();
|
|
for lib in ext_libs.iter().flatten() {
|
|
let lib_path = lib.realpath.clone().with_context(|| {
|