maturin 1.9.1__tar.gz → 1.9.3__tar.gz

{maturin-1.9.1 → maturin-1.9.3}/.pre-commit-config.yaml

@@ -56,12 +56,12 @@ repos:
           )
       - id: mixed-line-ending
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.2
+    rev: v0.12.5
     hooks:
       - id: ruff-format
       - id: ruff
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.16.1
+    rev: v1.17.0
     hooks:
       - id: mypy
         entry: mypy maturin/

{maturin-1.9.1 → maturin-1.9.3}/Cargo.lock

@@ -1436,7 +1436,7 @@ dependencies = [
 
 [[package]]
 name = "maturin"
-version = "1.9.1"
+version = "1.9.3"
 dependencies = [
  "anyhow",
  "base64 0.21.7",
@@ -1484,6 +1484,7 @@ dependencies = [
  "regex",
  "rstest",
  "rustc_version",
+ "rustflags",
  "rustls",
  "rustls-pemfile",
  "rustversion",

{maturin-1.9.1 → maturin-1.9.3}/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["konstin <konstin@mailbox.org>", "messense <messense@icloud.com>"]
 name = "maturin"
-version = "1.9.1"
+version = "1.9.3"
 description = "Build and publish crates with pyo3, cffi and uniffi bindings as well as rust binaries as python packages"
 exclude = [
     "test-crates/**/*",
@@ -50,6 +50,7 @@ flate2 = "1.0.18"
 goblin = "0.9.0"
 platform-info = "2.0.2"
 regex = "1.7.0"
+rustflags = "0.1.6"
 serde = { version = "1.0.197", features = ["derive"] }
 serde_json = "1.0.114"
 sha2 = "0.10.3"

{maturin-1.9.1 → maturin-1.9.3}/Changelog.md

@@ -2,6 +2,15 @@
 
 ## Unreleased
 
+## [1.9.3]
+
+* Fix adding `project.license-files` to source distributions.
+* Fix relative Readme rewrite of the root crate in source distributions.
+
+## [1.9.2]
+
+* Fix PEP 639 implementation, use `License-Expression` over `License`.
+
 ## [1.9.1]
 
 * Fix absolute license file path from `Cargo.toml` in [#2667](https://github.com/PyO3/maturin/pull/2667)

{maturin-1.9.1 → maturin-1.9.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maturin
-Version: 1.9.1
+Version: 1.9.3
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
@@ -10,12 +10,12 @@ Requires-Dist: ziglang>=0.10.0,<0.13.0 ; extra == 'zig'
 Requires-Dist: patchelf ; extra == 'patchelf'
 Provides-Extra: zig
 Provides-Extra: patchelf
+License-File: license-mit
+License-File: license-apache
 Summary: Build and publish crates with pyo3, cffi and uniffi bindings as well as rust binaries as python packages
-Keywords: python,cffi,packaging,pypi,pyo3
 Home-Page: https://github.com/pyo3/maturin
-Author: konstin <konstin@mailbox.org>, messense <messense@icloud.com>
 Author-email: konstin <konstin@mailbox.org>
-License: MIT OR Apache-2.0
+License-Expression: MIT OR Apache-2.0
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 Project-URL: Source Code, https://github.com/PyO3/maturin

{maturin-1.9.1 → maturin-1.9.3}/pyproject.toml

@@ -1,7 +1,7 @@
 # Workaround to bootstrap maturin on non-manylinux platforms
 [build-system]
 requires = [
-    "setuptools",
+    "setuptools>=77.0.0",
     "tomli>=1.1.0 ; python_version<'3.11'",
     "setuptools-rust>=1.11.0",
 ]
@@ -14,7 +14,11 @@ description = "Build and publish crates with pyo3, cffi and uniffi bindings as w
 authors = [{ name = "konstin", email = "konstin@mailbox.org" }]
 readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.7"
-license = { text = "MIT OR Apache-2.0" }
+license = "MIT OR Apache-2.0"
+license-files = [
+    "license-mit",
+    "license-apache",
+]
 classifiers = [
     "Topic :: Software Development :: Build Tools",
     "Programming Language :: Rust",

{maturin-1.9.1 → maturin-1.9.3}/src/auditwheel/audit.rs

@@ -473,6 +473,7 @@ pub fn get_policy_and_libs(
     artifact: &BuildArtifact,
     platform_tag: Option<PlatformTag>,
     target: &Target,
+    manifest_path: &Path,
     allow_linking_libpython: bool,
 ) -> Result<(Policy, Vec<Library>)> {
     let (policy, should_repair) =
@@ -487,7 +488,13 @@ pub fn get_policy_and_libs(
         )?;
     let external_libs = if should_repair {
         let sysroot = get_sysroot_path(target).unwrap_or_else(|_| PathBuf::from("/"));
-        let ld_paths = artifact.linked_paths.iter().map(PathBuf::from).collect();
+        let mut ld_paths: Vec<PathBuf> = artifact.linked_paths.iter().map(PathBuf::from).collect();
+
+        // Add library search paths from RUSTFLAGS
+        if let Some(rustflags_paths) = extract_rustflags_library_paths(manifest_path, target) {
+            ld_paths.extend(rustflags_paths);
+        }
+
         let external_libs = find_external_libs(&artifact.path, &policy, sysroot, ld_paths)
             .with_context(|| {
                 if let Some(platform_tag) = platform_tag {
@@ -510,6 +517,30 @@ pub fn get_policy_and_libs(
     Ok((policy, external_libs))
 }
 
+/// Extract library search paths from RUSTFLAGS configuration
+#[cfg_attr(test, allow(dead_code))]
+fn extract_rustflags_library_paths(manifest_path: &Path, target: &Target) -> Option<Vec<PathBuf>> {
+    let manifest_dir = manifest_path.parent()?;
+    let config = cargo_config2::Config::load_with_cwd(manifest_dir).ok()?;
+    let rustflags = config.rustflags(target.target_triple()).ok()??;
+
+    // Encode the rustflags for parsing with the rustflags crate
+    let encoded = rustflags.encode().ok()?;
+
+    let mut library_paths = Vec::new();
+    for flag in rustflags::from_encoded(encoded.as_ref()) {
+        if let rustflags::Flag::LibrarySearchPath { kind: _, path } = flag {
+            library_paths.push(path);
+        }
+    }
+
+    if library_paths.is_empty() {
+        None
+    } else {
+        Some(library_paths)
+    }
+}
+
 pub fn relpath(to: &Path, from: &Path) -> PathBuf {
     let mut suffix_pos = 0;
     for (f, t) in from.components().zip(to.components()) {
@@ -534,6 +565,7 @@ pub fn relpath(to: &Path, from: &Path) -> PathBuf {
 #[cfg(test)]
 mod test {
     use crate::auditwheel::audit::relpath;
+    use crate::Target;
     use pretty_assertions::assert_eq;
     use std::path::Path;
 
@@ -551,4 +583,81 @@ mod test {
             assert_eq!(result, Path::new(expected));
         }
     }
+
+    #[test]
+    fn test_extract_rustflags_library_paths() {
+        // Create a temporary directory with a Cargo.toml and .cargo/config.toml
+        let temp_dir = tempfile::tempdir().unwrap();
+        let manifest_path = temp_dir.path().join("Cargo.toml");
+        let cargo_dir = temp_dir.path().join(".cargo");
+        let config_path = cargo_dir.join("config.toml");
+
+        // Create the directories
+        fs_err::create_dir_all(&cargo_dir).unwrap();
+
+        // Create a minimal Cargo.toml
+        fs_err::write(
+            &manifest_path,
+            r#"
+[package]
+name = "test-package"
+version = "0.1.0"
+edition = "2021"
+"#,
+        )
+        .unwrap();
+
+        // Create a config.toml with rustflags containing -L options
+        fs_err::write(
+            &config_path,
+            r#"
+[build]
+rustflags = ["-L", "dependency=/usr/local/lib", "-L", "/some/other/path", "-C", "opt-level=3"]
+"#,
+        )
+        .unwrap();
+
+        // Test the function
+        let target = Target::from_target_triple(None).unwrap();
+        let paths = super::extract_rustflags_library_paths(&manifest_path, &target);
+
+        if let Some(paths) = paths {
+            assert_eq!(paths.len(), 2);
+            assert!(paths
+                .iter()
+                .any(|p| p.to_string_lossy() == "/usr/local/lib"));
+            assert!(paths
+                .iter()
+                .any(|p| p.to_string_lossy() == "/some/other/path"));
+        } else {
+            // It's possible that rustflags parsing fails in some environments,
+            // so we just verify the function doesn't panic
+            println!("No rustflags library paths found, which is acceptable");
+        }
+    }
+
+    #[test]
+    fn test_extract_rustflags_library_paths_no_config() {
+        // Test with a directory that has no cargo config
+        let temp_dir = tempfile::tempdir().unwrap();
+        let manifest_path = temp_dir.path().join("Cargo.toml");
+
+        // Create a minimal Cargo.toml
+        fs_err::write(
+            &manifest_path,
+            r#"
+[package]
+name = "test-package"
+version = "0.1.0"
+edition = "2021"
+"#,
+        )
+        .unwrap();
+
+        let target = Target::from_target_triple(None).unwrap();
+        let paths = super::extract_rustflags_library_paths(&manifest_path, &target);
+
+        // Should return None when there's no cargo config with rustflags
+        assert!(paths.is_none());
+    }
 }

{maturin-1.9.1 → maturin-1.9.3}/src/auditwheel/manylinux-policy.json

@@ -29,7 +29,7 @@
         "ZLIB": []
       }
     },
-    "lib_whitelist": ["libatomic.so.1", "libgcc_s.so.1", "libstdc++.so.6", "libm.so.6", "libdl.so.2", "librt.so.1", "libc.so.6", "libnsl.so.1", "libutil.so.1", "libpthread.so.0", "libX11.so.6", "libXext.so.6", "libXrender.so.1", "libICE.so.6", "libSM.so.6", "libGL.so.1", "libgobject-2.0.so.0", "libgthread-2.0.so.0", "libglib-2.0.so.0", "libresolv.so.2", "libz.so.1"],
+    "lib_whitelist": ["libatomic.so.1", "libgcc_s.so.1", "libstdc++.so.6", "libm.so.6", "libanl.so.1", "libdl.so.2", "librt.so.1", "libc.so.6", "libnsl.so.1", "libutil.so.1", "libpthread.so.0", "libX11.so.6", "libXext.so.6", "libXrender.so.1", "libICE.so.6", "libSM.so.6", "libGL.so.1", "libgobject-2.0.so.0", "libgthread-2.0.so.0", "libglib-2.0.so.0", "libresolv.so.2", "libz.so.1"],
     "blacklist": {
       "libz.so.1": ["_dist_code", "_length_code", "_tr_align", "_tr_flush_block", "_tr_init", "_tr_stored_block", "_tr_tally", "adler32_default", "bi_windup", "crc32_acle", "crc32_combine_gen", "crc32_combine_gen64", "crc32_combine_op", "crc32_le_vgfm_16", "crc32_neon", "crc32_vpmsum", "crc32_z_default", "crc_fold_512to32", "crc_fold_copy", "crc_fold_init", "deflate_copyright", "deflate_medium", "fill_window", "flush_pending", "gzflags", "inflate_copyright", "inflate_fast", "inflate_table", "longest_match", "slide_hash_sse", "static_ltree", "uncompress2", "x86_check_features", "x86_cpu_has_pclmul", "x86_cpu_has_sse2", "x86_cpu_has_sse42", "z_errmsg", "z_vstring", "zcalloc", "zcfree"]
     }
@@ -56,7 +56,7 @@
         "ZLIB": ["1.2.0", "1.2.0.2", "1.2.0.8", "1.2.2", "1.2.2.3", "1.2.2.4"]
       }
     },
-    "lib_whitelist": ["libatomic.so.1", "libgcc_s.so.1", "libstdc++.so.6", "libm.so.6", "libdl.so.2", "librt.so.1", "libc.so.6", "libnsl.so.1", "libutil.so.1", "libpthread.so.0", "libX11.so.6", "libXext.so.6", "libXrender.so.1", "libICE.so.6", "libSM.so.6", "libGL.so.1", "libgobject-2.0.so.0", "libgthread-2.0.so.0", "libglib-2.0.so.0", "libresolv.so.2", "libexpat.so.1", "libz.so.1"],
+    "lib_whitelist": ["libatomic.so.1", "libgcc_s.so.1", "libstdc++.so.6", "libm.so.6", "libanl.so.1", "libdl.so.2", "librt.so.1", "libc.so.6", "libnsl.so.1", "libutil.so.1", "libpthread.so.0", "libX11.so.6", "libXext.so.6", "libXrender.so.1", "libICE.so.6", "libSM.so.6", "libGL.so.1", "libgobject-2.0.so.0", "libgthread-2.0.so.0", "libglib-2.0.so.0", "libresolv.so.2", "libexpat.so.1", "libz.so.1"],
     "blacklist": {
       "libz.so.1": ["_dist_code", "_length_code", "_tr_align", "_tr_flush_block", "_tr_init", "_tr_stored_block", "_tr_tally", "adler32_default", "bi_windup", "crc32_acle", "crc32_combine_gen", "crc32_combine_gen64", "crc32_combine_op", "crc32_le_vgfm_16", "crc32_neon", "crc32_vpmsum", "crc32_z_default", "crc_fold_512to32", "crc_fold_copy", "crc_fold_init", "deflate_copyright", "deflate_medium", "fill_window", "flush_pending", "gzflags", "inflate_copyright", "inflate_fast", "inflate_table", "longest_match", "slide_hash_sse", "static_ltree", "uncompress2", "x86_check_features", "x86_cpu_has_pclmul", "x86_cpu_has_sse2", "x86_cpu_has_sse42", "z_errmsg", "z_vstring", "zcalloc", "zcfree"]
     }
@@ -123,7 +123,7 @@
         "ZLIB": ["1.2.0", "1.2.0.2", "1.2.0.8", "1.2.2", "1.2.2.3", "1.2.2.4", "1.2.3.3", "1.2.3.4", "1.2.3.5", "1.2.5.1", "1.2.5.2"]
       }
     },
-    "lib_whitelist": ["libatomic.so.1", "libgcc_s.so.1", "libstdc++.so.6", "libm.so.6", "libdl.so.2", "librt.so.1", "libc.so.6", "libnsl.so.1", "libutil.so.1", "libpthread.so.0", "libX11.so.6", "libXext.so.6", "libXrender.so.1", "libICE.so.6", "libSM.so.6", "libGL.so.1", "libgobject-2.0.so.0", "libgthread-2.0.so.0", "libglib-2.0.so.0", "libresolv.so.2", "libexpat.so.1", "libz.so.1"],
+    "lib_whitelist": ["libatomic.so.1", "libgcc_s.so.1", "libstdc++.so.6", "libm.so.6", "libanl.so.1", "libdl.so.2", "librt.so.1", "libc.so.6", "libnsl.so.1", "libutil.so.1", "libpthread.so.0", "libX11.so.6", "libXext.so.6", "libXrender.so.1", "libICE.so.6", "libSM.so.6", "libGL.so.1", "libgobject-2.0.so.0", "libgthread-2.0.so.0", "libglib-2.0.so.0", "libresolv.so.2", "libexpat.so.1", "libz.so.1"],
     "blacklist": {
       "libz.so.1": ["_dist_code", "_length_code", "_tr_align", "_tr_flush_block", "_tr_init", "_tr_stored_block", "_tr_tally", "adler32_default", "bi_windup", "crc32_acle", "crc32_combine_gen", "crc32_combine_gen64", "crc32_combine_op", "crc32_le_vgfm_16", "crc32_neon", "crc32_vpmsum", "crc32_z_default", "crc_fold_512to32", "crc_fold_copy", "crc_fold_init", "deflate_copyright", "deflate_medium", "fill_window", "flush_pending", "gzflags", "inflate_copyright", "inflate_fast", "inflate_table", "longest_match", "slide_hash_sse", "static_ltree", "uncompress2", "x86_check_features", "x86_cpu_has_pclmul", "x86_cpu_has_sse2", "x86_cpu_has_sse42", "z_errmsg", "z_vstring", "zcalloc", "zcfree"]
     }
@@ -182,7 +182,66 @@
         "ZLIB": ["1.2.0", "1.2.0.2", "1.2.0.8", "1.2.2", "1.2.2.3", "1.2.2.4", "1.2.3.3", "1.2.3.4", "1.2.3.5", "1.2.5.1", "1.2.5.2"]
       }
     },
-    "lib_whitelist": ["libatomic.so.1", "libgcc_s.so.1", "libstdc++.so.6", "libm.so.6", "libdl.so.2", "librt.so.1", "libc.so.6", "libnsl.so.1", "libutil.so.1", "libpthread.so.0", "libX11.so.6", "libXext.so.6", "libXrender.so.1", "libICE.so.6", "libSM.so.6", "libGL.so.1", "libgobject-2.0.so.0", "libgthread-2.0.so.0", "libglib-2.0.so.0", "libresolv.so.2", "libexpat.so.1", "libz.so.1"],
+    "lib_whitelist": ["libatomic.so.1", "libgcc_s.so.1", "libstdc++.so.6", "libm.so.6", "libanl.so.1", "libdl.so.2", "librt.so.1", "libc.so.6", "libnsl.so.1", "libutil.so.1", "libpthread.so.0", "libX11.so.6", "libXext.so.6", "libXrender.so.1", "libICE.so.6", "libSM.so.6", "libGL.so.1", "libgobject-2.0.so.0", "libgthread-2.0.so.0", "libglib-2.0.so.0", "libresolv.so.2", "libexpat.so.1", "libz.so.1"],
+    "blacklist": {
+      "libz.so.1": ["_dist_code", "_length_code", "_tr_align", "_tr_flush_block", "_tr_init", "_tr_stored_block", "_tr_tally", "adler32_default", "bi_windup", "crc32_acle", "crc32_combine_gen", "crc32_combine_gen64", "crc32_combine_op", "crc32_le_vgfm_16", "crc32_neon", "crc32_vpmsum", "crc32_z_default", "crc_fold_512to32", "crc_fold_copy", "crc_fold_init", "deflate_copyright", "deflate_medium", "fill_window", "flush_pending", "gzflags", "inflate_copyright", "inflate_fast", "inflate_table", "longest_match", "slide_hash_sse", "static_ltree", "uncompress2", "x86_check_features", "x86_cpu_has_pclmul", "x86_cpu_has_sse2", "x86_cpu_has_sse42", "z_errmsg", "z_vstring", "zcalloc", "zcfree"]
+    }
+  },
+  {
+    "name": "manylinux_2_26",
+    "aliases": [],
+    "priority": 68,
+    "symbol_versions": {
+      "i686": {
+        "CXXABI": ["1.3", "1.3.1", "1.3.2", "1.3.3", "1.3.4", "1.3.5", "1.3.6", "1.3.7", "1.3.8", "1.3.9", "1.3.10", "1.3.11", "FLOAT128", "TM_1"],
+        "GCC": ["3.0", "3.3", "3.3.1", "3.4", "3.4.2", "4.0.0", "4.2.0", "4.3.0", "4.4.0", "4.5.0", "4.7.0", "4.8.0", "7.0.0"],
+        "GLIBC": ["2.0", "2.1", "2.1.1", "2.1.2", "2.1.3", "2.2", "2.2.1", "2.2.2", "2.2.3", "2.2.4", "2.2.6", "2.3", "2.3.2", "2.3.3", "2.3.4", "2.4", "2.5", "2.6", "2.7", "2.8", "2.9", "2.10", "2.11", "2.12", "2.13", "2.14", "2.15", "2.16", "2.17", "2.18", "2.22", "2.23", "2.24", "2.25", "2.26"],
+        "GLIBCXX": ["3.4", "3.4.1", "3.4.2", "3.4.3", "3.4.4", "3.4.5", "3.4.6", "3.4.7", "3.4.8", "3.4.9", "3.4.10", "3.4.11", "3.4.12", "3.4.13", "3.4.14", "3.4.15", "3.4.16", "3.4.17", "3.4.18", "3.4.19", "3.4.20", "3.4.21", "3.4.22", "3.4.23", "3.4.24"],
+        "LIBATOMIC": ["1.0", "1.1", "1.2"],
+        "ZLIB": ["1.2.0", "1.2.0.2", "1.2.0.8", "1.2.2", "1.2.2.3", "1.2.2.4", "1.2.3.3", "1.2.3.4", "1.2.3.5", "1.2.5.1", "1.2.5.2", "1.2.7.1", "1.2.9"]
+      },
+      "x86_64": {
+        "CXXABI": ["1.3", "1.3.1", "1.3.2", "1.3.3", "1.3.4", "1.3.5", "1.3.6", "1.3.7", "1.3.8", "1.3.9", "1.3.10", "FLOAT128", "TM_1"],
+        "GCC": ["3.0", "3.3", "3.3.1", "3.4", "3.4.2", "3.4.4", "4.0.0", "4.2.0", "4.3.0", "4.7.0", "4.8.0"],
+        "GLIBC": ["2.2.5", "2.2.6", "2.3", "2.3.2", "2.3.3", "2.3.4", "2.4", "2.5", "2.6", "2.7", "2.8", "2.9", "2.10", "2.11", "2.12", "2.13", "2.14", "2.15", "2.16", "2.17", "2.18", "2.22", "2.23", "2.24", "2.25", "2.26"],
+        "GLIBCXX": ["3.4", "3.4.1", "3.4.2", "3.4.3", "3.4.4", "3.4.5", "3.4.6", "3.4.7", "3.4.8", "3.4.9", "3.4.10", "3.4.11", "3.4.12", "3.4.13", "3.4.14", "3.4.15", "3.4.16", "3.4.17", "3.4.18", "3.4.19", "3.4.20", "3.4.21", "3.4.22"],
+        "LIBATOMIC": ["1.0", "1.1", "1.2"],
+        "ZLIB": ["1.2.0", "1.2.0.2", "1.2.0.8", "1.2.2", "1.2.2.3", "1.2.2.4", "1.2.3.3", "1.2.3.4", "1.2.3.5", "1.2.5.1", "1.2.5.2"]
+      },
+      "aarch64": {
+        "CXXABI": ["1.3", "1.3.1", "1.3.2", "1.3.3", "1.3.4", "1.3.5", "1.3.6", "1.3.7", "1.3.8", "1.3.9", "1.3.10", "1.3.11", "TM_1"],
+        "GCC": ["3.0", "3.3", "3.3.1", "3.4", "3.4.2", "3.4.4", "4.0.0", "4.2.0", "4.3.0", "4.5.0", "4.7.0", "7.0.0"],
+        "GLIBC": ["2.0", "2.17", "2.18", "2.22", "2.23", "2.24", "2.25", "2.26"],
+        "GLIBCXX": ["3.4", "3.4.1", "3.4.2", "3.4.3", "3.4.4", "3.4.5", "3.4.6", "3.4.7", "3.4.8", "3.4.9", "3.4.10", "3.4.11", "3.4.12", "3.4.13", "3.4.14", "3.4.15", "3.4.16", "3.4.17", "3.4.18", "3.4.19", "3.4.20", "3.4.21", "3.4.22", "3.4.23", "3.4.24"],
+        "LIBATOMIC": ["1.0", "1.1", "1.2"],
+        "ZLIB": ["1.2.0", "1.2.0.2", "1.2.0.8", "1.2.2", "1.2.2.3", "1.2.2.4", "1.2.3.3", "1.2.3.4", "1.2.3.5", "1.2.5.1", "1.2.5.2"]
+      },
+      "ppc64le": {
+        "CXXABI": ["1.3", "1.3.1", "1.3.2", "1.3.3", "1.3.4", "1.3.5", "1.3.6", "1.3.7", "1.3.8", "1.3.9", "1.3.10", "1.3.11", "LDBL_1.3", "TM_1"],
+        "GCC": ["3.0", "3.3", "3.3.1", "3.4", "3.4.2", "3.4.4", "4.0.0", "4.2.0", "4.3.0", "4.7.0", "7.0.0"],
+        "GLIBC": ["2.0", "2.17", "2.18", "2.22", "2.23", "2.24", "2.25", "2.26"],
+        "GLIBCXX": ["3.4", "3.4.1", "3.4.2", "3.4.3", "3.4.4", "3.4.5", "3.4.6", "3.4.7", "3.4.8", "3.4.9", "3.4.10", "3.4.11", "3.4.12", "3.4.13", "3.4.14", "3.4.15", "3.4.16", "3.4.17", "3.4.18", "3.4.19", "3.4.20", "3.4.21", "3.4.22", "3.4.23", "3.4.24", "LDBL_3.4", "LDBL_3.4.10", "LDBL_3.4.21", "LDBL_3.4.7"],
+        "LIBATOMIC": ["1.0", "1.1", "1.2"],
+        "ZLIB": ["1.2.0", "1.2.0.2", "1.2.0.8", "1.2.2", "1.2.2.3", "1.2.2.4", "1.2.3.3", "1.2.3.4", "1.2.3.5", "1.2.5.1", "1.2.5.2", "1.2.7.1", "1.2.9"]
+      },
+      "s390x": {
+        "CXXABI": ["1.3", "1.3.1", "1.3.2", "1.3.3", "1.3.4", "1.3.5", "1.3.6", "1.3.7", "1.3.8", "1.3.9", "1.3.10", "1.3.11", "LDBL_1.3", "TM_1"],
+        "GCC": ["3.0", "3.3", "3.3.1", "3.4", "3.4.2", "3.4.4", "4.0.0", "4.1.0", "4.2.0", "4.3.0", "4.7.0", "7.0.0"],
+        "GLIBC": ["2.2", "2.2.1", "2.2.2", "2.2.3", "2.2.4", "2.2.6", "2.3", "2.3.2", "2.3.3", "2.3.4", "2.4", "2.5", "2.6", "2.7", "2.8", "2.9", "2.10", "2.11", "2.12", "2.13", "2.14", "2.15", "2.16", "2.17", "2.18", "2.19", "2.22", "2.23", "2.24", "2.25", "2.26"],
+        "GLIBCXX": ["3.4", "3.4.1", "3.4.2", "3.4.3", "3.4.4", "3.4.5", "3.4.6", "3.4.7", "3.4.8", "3.4.9", "3.4.10", "3.4.11", "3.4.12", "3.4.13", "3.4.14", "3.4.15", "3.4.16", "3.4.17", "3.4.18", "3.4.19", "3.4.20", "3.4.21", "3.4.22", "3.4.23", "3.4.24", "LDBL_3.4", "LDBL_3.4.10", "LDBL_3.4.21", "LDBL_3.4.7"],
+        "LIBATOMIC": ["1.0", "1.1", "1.2"],
+        "ZLIB": ["1.2.0", "1.2.0.2", "1.2.0.8", "1.2.2", "1.2.2.3", "1.2.2.4", "1.2.3.3", "1.2.3.4", "1.2.3.5", "1.2.5.1", "1.2.5.2", "1.2.7.1", "1.2.9"]
+      },
+      "armv7l": {
+        "CXXABI": ["1.3", "1.3.1", "1.3.2", "1.3.3", "1.3.4", "1.3.5", "1.3.6", "1.3.7", "1.3.8", "1.3.9", "1.3.10", "1.3.11", "ARM_1.3.3", "TM_1"],
+        "GCC": ["3.0", "3.3", "3.3.1", "3.3.4", "3.4", "3.4.2", "3.5", "4.0.0", "4.2.0", "4.3.0", "4.7.0", "7.0.0"],
+        "GLIBC": ["2.0", "2.4", "2.5", "2.6", "2.7", "2.8", "2.9", "2.10", "2.11", "2.12", "2.13", "2.14", "2.15", "2.16", "2.17", "2.18", "2.22", "2.23", "2.24", "2.25", "2.26"],
+        "GLIBCXX": ["3.4", "3.4.1", "3.4.2", "3.4.3", "3.4.4", "3.4.5", "3.4.6", "3.4.7", "3.4.8", "3.4.9", "3.4.10", "3.4.11", "3.4.12", "3.4.13", "3.4.14", "3.4.15", "3.4.16", "3.4.17", "3.4.18", "3.4.19", "3.4.20", "3.4.21", "3.4.22", "3.4.23", "3.4.24"],
+        "LIBATOMIC": ["1.0", "1.1", "1.2"],
+        "ZLIB": ["1.2.0", "1.2.0.2", "1.2.0.8", "1.2.2", "1.2.2.3", "1.2.2.4", "1.2.3.3", "1.2.3.4", "1.2.3.5", "1.2.5.1", "1.2.5.2", "1.2.7.1", "1.2.9"]
+      }
+    },
+    "lib_whitelist": ["libatomic.so.1", "libgcc_s.so.1", "libstdc++.so.6", "libm.so.6", "libanl.so.1", "libdl.so.2", "librt.so.1", "libc.so.6", "libnsl.so.1", "libutil.so.1", "libpthread.so.0", "libX11.so.6", "libXext.so.6", "libXrender.so.1", "libICE.so.6", "libSM.so.6", "libGL.so.1", "libgobject-2.0.so.0", "libgthread-2.0.so.0", "libglib-2.0.so.0", "libresolv.so.2", "libexpat.so.1", "libz.so.1"],
     "blacklist": {
       "libz.so.1": ["_dist_code", "_length_code", "_tr_align", "_tr_flush_block", "_tr_init", "_tr_stored_block", "_tr_tally", "adler32_default", "bi_windup", "crc32_acle", "crc32_combine_gen", "crc32_combine_gen64", "crc32_combine_op", "crc32_le_vgfm_16", "crc32_neon", "crc32_vpmsum", "crc32_z_default", "crc_fold_512to32", "crc_fold_copy", "crc_fold_init", "deflate_copyright", "deflate_medium", "fill_window", "flush_pending", "gzflags", "inflate_copyright", "inflate_fast", "inflate_table", "longest_match", "slide_hash_sse", "static_ltree", "uncompress2", "x86_check_features", "x86_cpu_has_pclmul", "x86_cpu_has_sse2", "x86_cpu_has_sse42", "z_errmsg", "z_vstring", "zcalloc", "zcfree"]
     }
@@ -241,7 +300,7 @@
         "ZLIB": ["1.2.0", "1.2.0.2", "1.2.0.8", "1.2.2", "1.2.2.3", "1.2.2.4", "1.2.3.3", "1.2.3.4", "1.2.3.5", "1.2.5.1", "1.2.5.2", "1.2.7.1", "1.2.9"]
       }
     },
-    "lib_whitelist": ["libatomic.so.1", "libgcc_s.so.1", "libstdc++.so.6", "libm.so.6", "libdl.so.2", "librt.so.1", "libc.so.6", "libnsl.so.1", "libutil.so.1", "libpthread.so.0", "libX11.so.6", "libXext.so.6", "libXrender.so.1", "libICE.so.6", "libSM.so.6", "libGL.so.1", "libgobject-2.0.so.0", "libgthread-2.0.so.0", "libglib-2.0.so.0", "libresolv.so.2", "libexpat.so.1", "libz.so.1"],
+    "lib_whitelist": ["libatomic.so.1", "libgcc_s.so.1", "libstdc++.so.6", "libm.so.6", "libanl.so.1", "libdl.so.2", "librt.so.1", "libc.so.6", "libnsl.so.1", "libutil.so.1", "libpthread.so.0", "libX11.so.6", "libXext.so.6", "libXrender.so.1", "libICE.so.6", "libSM.so.6", "libGL.so.1", "libgobject-2.0.so.0", "libgthread-2.0.so.0", "libglib-2.0.so.0", "libresolv.so.2", "libexpat.so.1", "libz.so.1"],
     "blacklist": {
       "libz.so.1": ["_dist_code", "_length_code", "_tr_align", "_tr_flush_block", "_tr_init", "_tr_stored_block", "_tr_tally", "adler32_default", "bi_windup", "crc32_acle", "crc32_combine_gen", "crc32_combine_gen64", "crc32_combine_op", "crc32_le_vgfm_16", "crc32_neon", "crc32_vpmsum", "crc32_z_default", "crc_fold_512to32", "crc_fold_copy", "crc_fold_init", "deflate_copyright", "deflate_medium", "fill_window", "flush_pending", "gzflags", "inflate_copyright", "inflate_fast", "inflate_table", "longest_match", "slide_hash_sse", "static_ltree", "uncompress2", "x86_check_features", "x86_cpu_has_pclmul", "x86_cpu_has_sse2", "x86_cpu_has_sse42", "z_errmsg", "z_vstring", "zcalloc", "zcfree"]
     }
@@ -300,7 +359,7 @@
         "ZLIB": ["1.2.0", "1.2.0.2", "1.2.0.8", "1.2.2", "1.2.2.3", "1.2.2.4", "1.2.3.3", "1.2.3.4", "1.2.3.5", "1.2.5.1", "1.2.5.2", "1.2.7.1", "1.2.9"]
       }
     },
-    "lib_whitelist": ["libatomic.so.1", "libgcc_s.so.1", "libstdc++.so.6", "libm.so.6", "libdl.so.2", "librt.so.1", "libc.so.6", "libnsl.so.1", "libutil.so.1", "libpthread.so.0", "libX11.so.6", "libXext.so.6", "libXrender.so.1", "libICE.so.6", "libSM.so.6", "libGL.so.1", "libgobject-2.0.so.0", "libgthread-2.0.so.0", "libglib-2.0.so.0", "libresolv.so.2", "libexpat.so.1", "libz.so.1"],
+    "lib_whitelist": ["libatomic.so.1", "libgcc_s.so.1", "libstdc++.so.6", "libm.so.6", "libanl.so.1", "libdl.so.2", "librt.so.1", "libc.so.6", "libnsl.so.1", "libutil.so.1", "libpthread.so.0", "libX11.so.6", "libXext.so.6", "libXrender.so.1", "libICE.so.6", "libSM.so.6", "libGL.so.1", "libgobject-2.0.so.0", "libgthread-2.0.so.0", "libglib-2.0.so.0", "libresolv.so.2", "libexpat.so.1", "libz.so.1"],
     "blacklist": {
       "libz.so.1": ["_dist_code", "_length_code", "_tr_align", "_tr_flush_block", "_tr_init", "_tr_stored_block", "_tr_tally", "adler32_default", "bi_windup", "crc32_acle", "crc32_combine_gen", "crc32_combine_gen64", "crc32_combine_op", "crc32_le_vgfm_16", "crc32_neon", "crc32_vpmsum", "crc32_z_default", "crc_fold_512to32", "crc_fold_copy", "crc_fold_init", "deflate_copyright", "deflate_medium", "fill_window", "flush_pending", "gzflags", "inflate_copyright", "inflate_fast", "inflate_table", "longest_match", "slide_hash_sse", "static_ltree", "uncompress2", "x86_check_features", "x86_cpu_has_pclmul", "x86_cpu_has_sse2", "x86_cpu_has_sse42", "z_errmsg", "z_vstring", "zcalloc", "zcfree"]
     }
@@ -367,7 +426,7 @@
         "ZLIB": ["1.2.0", "1.2.0.2", "1.2.0.8", "1.2.2", "1.2.2.3", "1.2.2.4", "1.2.3.3", "1.2.3.4", "1.2.3.5", "1.2.5.1", "1.2.5.2", "1.2.7.1", "1.2.9"]
       }
     },
-    "lib_whitelist": ["libatomic.so.1", "libgcc_s.so.1", "libstdc++.so.6", "libm.so.6", "libdl.so.2", "librt.so.1", "libc.so.6", "libnsl.so.1", "libutil.so.1", "libpthread.so.0", "libX11.so.6", "libXext.so.6", "libXrender.so.1", "libICE.so.6", "libSM.so.6", "libGL.so.1", "libgobject-2.0.so.0", "libgthread-2.0.so.0", "libglib-2.0.so.0", "libresolv.so.2", "libexpat.so.1", "libz.so.1"],
+    "lib_whitelist": ["libatomic.so.1", "libgcc_s.so.1", "libstdc++.so.6", "libm.so.6", "libanl.so.1", "libdl.so.2", "librt.so.1", "libc.so.6", "libnsl.so.1", "libutil.so.1", "libpthread.so.0", "libX11.so.6", "libXext.so.6", "libXrender.so.1", "libICE.so.6", "libSM.so.6", "libGL.so.1", "libgobject-2.0.so.0", "libgthread-2.0.so.0", "libglib-2.0.so.0", "libresolv.so.2", "libexpat.so.1", "libz.so.1"],
     "blacklist": {
       "libz.so.1": ["_dist_code", "_length_code", "_tr_align", "_tr_flush_block", "_tr_init", "_tr_stored_block", "_tr_tally", "adler32_default", "bi_windup", "crc32_acle", "crc32_combine_gen", "crc32_combine_gen64", "crc32_combine_op", "crc32_le_vgfm_16", "crc32_neon", "crc32_vpmsum", "crc32_z_default", "crc_fold_512to32", "crc_fold_copy", "crc_fold_init", "deflate_copyright", "deflate_medium", "fill_window", "flush_pending", "gzflags", "inflate_copyright", "inflate_fast", "inflate_table", "longest_match", "slide_hash_sse", "static_ltree", "uncompress2", "x86_check_features", "x86_cpu_has_pclmul", "x86_cpu_has_sse2", "x86_cpu_has_sse42", "z_errmsg", "z_vstring", "zcalloc", "zcfree"]
     }
@@ -434,7 +493,7 @@
         "ZLIB": ["1.2.0", "1.2.0.2", "1.2.0.8", "1.2.2", "1.2.2.3", "1.2.2.4", "1.2.3.3", "1.2.3.4", "1.2.3.5", "1.2.5.1", "1.2.5.2", "1.2.7.1", "1.2.9"]
       }
     },
-    "lib_whitelist": ["libatomic.so.1", "libgcc_s.so.1", "libstdc++.so.6", "libm.so.6", "libdl.so.2", "librt.so.1", "libc.so.6", "libnsl.so.1", "libutil.so.1", "libpthread.so.0", "libX11.so.6", "libXext.so.6", "libXrender.so.1", "libICE.so.6", "libSM.so.6", "libGL.so.1", "libgobject-2.0.so.0", "libgthread-2.0.so.0", "libglib-2.0.so.0", "libresolv.so.2", "libexpat.so.1", "libz.so.1"],
+    "lib_whitelist": ["libatomic.so.1", "libgcc_s.so.1", "libstdc++.so.6", "libm.so.6", "libanl.so.1", "libdl.so.2", "librt.so.1", "libc.so.6", "libnsl.so.1", "libutil.so.1", "libpthread.so.0", "libX11.so.6", "libXext.so.6", "libXrender.so.1", "libICE.so.6", "libSM.so.6", "libGL.so.1", "libgobject-2.0.so.0", "libgthread-2.0.so.0", "libglib-2.0.so.0", "libresolv.so.2", "libexpat.so.1", "libz.so.1"],
     "blacklist": {
       "libz.so.1": ["_dist_code", "_length_code", "_tr_align", "_tr_flush_block", "_tr_init", "_tr_stored_block", "_tr_tally", "adler32_default", "bi_windup", "crc32_acle", "crc32_combine_gen", "crc32_combine_gen64", "crc32_combine_op", "crc32_le_vgfm_16", "crc32_neon", "crc32_vpmsum", "crc32_z_default", "crc_fold_512to32", "crc_fold_copy", "crc_fold_init", "deflate_copyright", "deflate_medium", "fill_window", "flush_pending", "gzflags", "inflate_copyright", "inflate_fast", "inflate_table", "longest_match", "slide_hash_sse", "static_ltree", "x86_check_features", "x86_cpu_has_pclmul", "x86_cpu_has_sse2", "x86_cpu_has_sse42", "z_errmsg", "z_vstring", "zcalloc", "zcfree"]
     }
@@ -501,7 +560,7 @@
         "ZLIB": ["1.2.0", "1.2.0.2", "1.2.0.8", "1.2.2", "1.2.2.3", "1.2.2.4", "1.2.3.3", "1.2.3.4", "1.2.3.5", "1.2.5.1", "1.2.5.2", "1.2.7.1", "1.2.9"]
       }
     },
-    "lib_whitelist": ["libatomic.so.1", "libgcc_s.so.1", "libstdc++.so.6", "libm.so.6", "libdl.so.2", "librt.so.1", "libc.so.6", "libnsl.so.1", "libutil.so.1", "libpthread.so.0", "libX11.so.6", "libXext.so.6", "libXrender.so.1", "libICE.so.6", "libSM.so.6", "libGL.so.1", "libgobject-2.0.so.0", "libgthread-2.0.so.0", "libglib-2.0.so.0", "libresolv.so.2", "libexpat.so.1", "libz.so.1"],
+    "lib_whitelist": ["libatomic.so.1", "libgcc_s.so.1", "libstdc++.so.6", "libm.so.6", "libanl.so.1", "libdl.so.2", "librt.so.1", "libc.so.6", "libnsl.so.1", "libutil.so.1", "libpthread.so.0", "libX11.so.6", "libXext.so.6", "libXrender.so.1", "libICE.so.6", "libSM.so.6", "libGL.so.1", "libgobject-2.0.so.0", "libgthread-2.0.so.0", "libglib-2.0.so.0", "libresolv.so.2", "libexpat.so.1", "libz.so.1"],
     "blacklist": {
       "libz.so.1": ["_dist_code", "_length_code", "_tr_align", "_tr_flush_block", "_tr_init", "_tr_stored_block", "_tr_tally", "adler32_default", "bi_windup", "crc32_acle", "crc32_combine_gen", "crc32_combine_gen64", "crc32_combine_op", "crc32_le_vgfm_16", "crc32_neon", "crc32_vpmsum", "crc32_z_default", "crc_fold_512to32", "crc_fold_copy", "crc_fold_init", "deflate_copyright", "deflate_medium", "fill_window", "flush_pending", "gzflags", "inflate_copyright", "inflate_fast", "inflate_table", "longest_match", "slide_hash_sse", "static_ltree", "x86_check_features", "x86_cpu_has_pclmul", "x86_cpu_has_sse2", "x86_cpu_has_sse42", "z_errmsg", "z_vstring", "zcalloc", "zcfree"]
     }
@@ -576,7 +635,7 @@
         "ZLIB": ["1.2.0", "1.2.0.2", "1.2.0.8", "1.2.2", "1.2.2.3", "1.2.2.4", "1.2.3.3", "1.2.3.4", "1.2.3.5", "1.2.5.1", "1.2.5.2", "1.2.7.1", "1.2.9"]
       }
     },
-    "lib_whitelist": ["libatomic.so.1", "libgcc_s.so.1", "libstdc++.so.6", "libm.so.6", "libdl.so.2", "librt.so.1", "libc.so.6", "libnsl.so.1", "libutil.so.1", "libpthread.so.0", "libX11.so.6", "libXext.so.6", "libXrender.so.1", "libICE.so.6", "libSM.so.6", "libGL.so.1", "libgobject-2.0.so.0", "libgthread-2.0.so.0", "libglib-2.0.so.0", "libresolv.so.2", "libexpat.so.1", "libz.so.1"],
+    "lib_whitelist": ["libatomic.so.1", "libgcc_s.so.1", "libstdc++.so.6", "libm.so.6", "libanl.so.1", "libdl.so.2", "librt.so.1", "libc.so.6", "libnsl.so.1", "libutil.so.1", "libpthread.so.0", "libX11.so.6", "libXext.so.6", "libXrender.so.1", "libICE.so.6", "libSM.so.6", "libGL.so.1", "libgobject-2.0.so.0", "libgthread-2.0.so.0", "libglib-2.0.so.0", "libresolv.so.2", "libexpat.so.1", "libz.so.1"],
     "blacklist": {
       "libz.so.1": ["_dist_code", "_length_code", "_tr_align", "_tr_flush_block", "_tr_init", "_tr_stored_block", "_tr_tally", "adler32_default", "crc32_acle", "crc32_combine_gen", "crc32_combine_gen64", "crc32_combine_op", "crc32_le_vgfm_16", "crc32_neon", "crc32_vpmsum", "crc32_z_default", "deflate_copyright", "gzflags", "inflate_copyright", "inflate_fast", "inflate_table", "z_errmsg", "z_vstring", "zcalloc", "zcfree"]
     }
@@ -651,7 +710,7 @@
         "ZLIB": ["1.2.0", "1.2.0.2", "1.2.0.8", "1.2.2", "1.2.2.3", "1.2.2.4", "1.2.3.3", "1.2.3.4", "1.2.3.5", "1.2.5.1", "1.2.5.2", "1.2.7.1", "1.2.9", "1.2.12"]
       }
     },
-    "lib_whitelist": ["libatomic.so.1", "libgcc_s.so.1", "libstdc++.so.6", "libm.so.6", "libdl.so.2", "librt.so.1", "libc.so.6", "libnsl.so.1", "libutil.so.1", "libpthread.so.0", "libX11.so.6", "libXext.so.6", "libXrender.so.1", "libICE.so.6", "libSM.so.6", "libGL.so.1", "libgobject-2.0.so.0", "libgthread-2.0.so.0", "libglib-2.0.so.0", "libresolv.so.2", "libexpat.so.1", "libz.so.1"],
+    "lib_whitelist": ["libatomic.so.1", "libgcc_s.so.1", "libstdc++.so.6", "libm.so.6", "libanl.so.1", "libdl.so.2", "librt.so.1", "libc.so.6", "libnsl.so.1", "libutil.so.1", "libpthread.so.0", "libX11.so.6", "libXext.so.6", "libXrender.so.1", "libICE.so.6", "libSM.so.6", "libGL.so.1", "libgobject-2.0.so.0", "libgthread-2.0.so.0", "libglib-2.0.so.0", "libresolv.so.2", "libexpat.so.1", "libz.so.1"],
     "blacklist": {
       "libz.so.1": ["_dist_code", "_length_code", "_tr_align", "_tr_flush_block", "_tr_init", "_tr_stored_block", "_tr_tally", "adler32_default", "crc32_acle", "crc32_le_vgfm_16", "crc32_neon", "crc32_vpmsum", "crc32_z_default", "deflate_copyright", "gzflags", "inflate_copyright", "inflate_fast", "inflate_table", "z_errmsg", "z_vstring", "zcalloc", "zcfree"]
     }
@@ -726,7 +785,7 @@
         "ZLIB": ["1.2.0", "1.2.0.2", "1.2.0.8", "1.2.2", "1.2.2.3", "1.2.2.4", "1.2.3.3", "1.2.3.4", "1.2.3.5", "1.2.5.1", "1.2.5.2", "1.2.7.1", "1.2.9", "1.2.12"]
       }
     },
-    "lib_whitelist": ["libatomic.so.1", "libgcc_s.so.1", "libstdc++.so.6", "libm.so.6", "libdl.so.2", "librt.so.1", "libc.so.6", "libnsl.so.1", "libutil.so.1", "libpthread.so.0", "libX11.so.6", "libXext.so.6", "libXrender.so.1", "libICE.so.6", "libSM.so.6", "libGL.so.1", "libgobject-2.0.so.0", "libgthread-2.0.so.0", "libglib-2.0.so.0", "libresolv.so.2", "libexpat.so.1", "libz.so.1"],
+    "lib_whitelist": ["libatomic.so.1", "libgcc_s.so.1", "libstdc++.so.6", "libm.so.6", "libanl.so.1", "libdl.so.2", "librt.so.1", "libc.so.6", "libnsl.so.1", "libutil.so.1", "libpthread.so.0", "libX11.so.6", "libXext.so.6", "libXrender.so.1", "libICE.so.6", "libSM.so.6", "libGL.so.1", "libgobject-2.0.so.0", "libgthread-2.0.so.0", "libglib-2.0.so.0", "libresolv.so.2", "libexpat.so.1", "libz.so.1"],
     "blacklist": {
       "libz.so.1": ["_dist_code", "_length_code", "_tr_align", "_tr_flush_block", "_tr_init", "_tr_stored_block", "_tr_tally", "adler32_default", "crc32_acle", "crc32_le_vgfm_16", "crc32_neon", "crc32_vpmsum", "crc32_z_default", "deflate_copyright", "gzflags", "inflate_copyright", "inflate_fast", "inflate_table", "z_errmsg", "z_vstring", "zcalloc", "zcfree"]
     }
@@ -801,7 +860,7 @@
         "ZLIB": ["1.2.0", "1.2.0.2", "1.2.0.8", "1.2.2", "1.2.2.3", "1.2.2.4", "1.2.3.3", "1.2.3.4", "1.2.3.5", "1.2.5.1", "1.2.5.2", "1.2.7.1", "1.2.9", "1.2.12"]
       }
     },
-    "lib_whitelist": ["libatomic.so.1", "libgcc_s.so.1", "libstdc++.so.6", "libm.so.6", "libdl.so.2", "librt.so.1", "libc.so.6", "libnsl.so.1", "libutil.so.1", "libpthread.so.0", "libX11.so.6", "libXext.so.6", "libXrender.so.1", "libICE.so.6", "libSM.so.6", "libGL.so.1", "libgobject-2.0.so.0", "libgthread-2.0.so.0", "libglib-2.0.so.0", "libresolv.so.2", "libexpat.so.1", "libz.so.1"],
+    "lib_whitelist": ["libatomic.so.1", "libgcc_s.so.1", "libstdc++.so.6", "libm.so.6", "libanl.so.1", "libdl.so.2", "librt.so.1", "libc.so.6", "libnsl.so.1", "libutil.so.1", "libpthread.so.0", "libX11.so.6", "libXext.so.6", "libXrender.so.1", "libICE.so.6", "libSM.so.6", "libGL.so.1", "libgobject-2.0.so.0", "libgthread-2.0.so.0", "libglib-2.0.so.0", "libresolv.so.2", "libexpat.so.1", "libz.so.1"],
     "blacklist": {
       "libz.so.1": ["_dist_code", "_length_code", "_tr_align", "_tr_flush_block", "_tr_init", "_tr_stored_block", "_tr_tally", "adler32_default", "crc32_acle", "crc32_le_vgfm_16", "crc32_neon", "crc32_vpmsum", "crc32_z_default", "deflate_copyright", "gzflags", "inflate_copyright", "inflate_fast", "inflate_table", "z_errmsg", "z_vstring", "zcalloc", "zcfree"]
     }

{maturin-1.9.1 → maturin-1.9.3}/src/build_context.rs

@@ -345,12 +345,19 @@ impl BuildContext {
                 artifact,
                 Some(musllinux[0]),
                 &self.target,
+                &self.manifest_path,
                 allow_linking_libpython,
             );
         }
 
         let tag = others.first().or_else(|| musllinux.first()).copied();
-        get_policy_and_libs(artifact, tag, &self.target, allow_linking_libpython)
+        get_policy_and_libs(
+            artifact,
+            tag,
+            &self.target,
+            &self.manifest_path,
+            allow_linking_libpython,
+        )
     }
 
     /// Add library search paths in Cargo target directory rpath when building in editable mode

{maturin-1.9.1 → maturin-1.9.3}/src/develop.rs

@@ -67,7 +67,7 @@ impl InstallBackend {
         };
         if let Some(captures) = re.expect("regex should be valid").captures(stdout) {
             Ok(semver::Version::parse(&captures[1])
-                .with_context(|| format!("failed to parse semver from {:?}", stdout))?)
+                .with_context(|| format!("failed to parse semver from {stdout:?}"))?)
         } else {
             bail!("failed to parse version from {:?}", stdout);
         }
@@ -321,7 +321,7 @@ fn install_wheel(
         );
     }
     if let Err(err) = configure_as_editable(build_context, python, install_backend) {
-        eprintln!("⚠️ Warning: failed to set package as editable: {}", err);
+        eprintln!("⚠️ Warning: failed to set package as editable: {err}");
     }
     Ok(())
 }

{maturin-1.9.1 → maturin-1.9.3}/src/lib.rs

@@ -40,6 +40,7 @@ pub use crate::module_writer::{
 pub use crate::new_project::{init_project, new_project, GenerateProjectOptions};
 pub use crate::pyproject_toml::PyProjectToml;
 pub use crate::python_interpreter::PythonInterpreter;
+pub use crate::source_distribution::find_path_deps;
 #[cfg(feature = "upload")]
 pub use crate::upload::{upload, upload_ui, PublishOpt, Registry, UploadError};
 pub use auditwheel::PlatformTag;

{maturin-1.9.1 → maturin-1.9.3}/src/main.rs

@@ -13,8 +13,8 @@ use clap::{Parser, Subcommand};
 #[cfg(feature = "scaffolding")]
 use maturin::{ci::GenerateCI, init_project, new_project, GenerateProjectOptions};
 use maturin::{
-    develop, write_dist_info, BridgeModel, BuildOptions, CargoOptions, DevelopOptions, PathWriter,
-    PythonInterpreter, Target, TargetTriple,
+    develop, find_path_deps, write_dist_info, BridgeModel, BuildOptions, CargoOptions,
+    DevelopOptions, PathWriter, PythonInterpreter, Target, TargetTriple,
 };
 #[cfg(feature = "schemars")]
 use maturin::{generate_json_schema, GenerateJsonSchemaOptions};
@@ -433,13 +433,29 @@ fn run() -> Result<()> {
             develop(develop_options, &venv_dir)?;
         }
         Command::SDist { manifest_path, out } => {
+            // Get cargo metadata to check for path dependencies
+            let cargo_metadata_result = cargo_metadata::MetadataCommand::new()
+                .cargo_path("cargo")
+                .manifest_path(
+                    manifest_path
+                        .as_deref()
+                        .unwrap_or_else(|| std::path::Path::new("Cargo.toml")),
+                )
+                .verbose(true)
+                .exec();
+
+            let has_path_deps = cargo_metadata_result
+                .ok()
+                .and_then(|metadata| find_path_deps(&metadata).ok())
+                .map(|path_deps| !path_deps.is_empty())
+                .unwrap_or(false); // If we can't get metadata, don't force all features
             let build_options = BuildOptions {
                 out,
                 cargo: CargoOptions {
                     manifest_path,
-                    // Enable all features to ensure all optional path dependencies are packaged
-                    // into source distribution
-                    all_features: true,
+                    // Only enable all features when we have local path dependencies
+                    // to ensure they are packaged into source distribution
+                    all_features: has_path_deps,
                     ..Default::default()
                 },
                 ..Default::default()

{maturin-1.9.1 → maturin-1.9.3}/src/metadata.rs

@@ -55,7 +55,7 @@ pub struct Metadata24 {
     pub maintainer: Option<String>,
     pub maintainer_email: Option<String>,
     pub license: Option<String>,
-    // https://peps.python.org/pep-0639/#license-file-multiple-use
+    pub license_expression: Option<String>,
     pub license_files: Vec<PathBuf>,
     pub classifiers: Vec<String>,
     pub requires_dist: Vec<Requirement>,
@@ -90,6 +90,7 @@ impl Metadata24 {
             maintainer: None,
             maintainer_email: None,
             license: None,
+            license_expression: None,
             license_files: vec![],
             classifiers: vec![],
             requires_dist: vec![],
@@ -147,6 +148,41 @@ impl Metadata24 {
                 bail!("`project.dynamic` must not specify `name` in pyproject.toml");
             }
 
+            // According to PEP 621, build backends must not add metadata fields
+            // that are not declared in the dynamic list. Clear fields from Cargo.toml
+            // that are not in the dynamic list.
+            if !dynamic.contains("description") {
+                self.summary = None;
+            }
+            if !dynamic.contains("authors") {
+                self.author = None;
+                self.author_email = None;
+            }
+            if !dynamic.contains("maintainers") {
+                self.maintainer = None;
+                self.maintainer_email = None;
+            }
+            if !dynamic.contains("keywords") {
+                self.keywords = None;
+            }
+            if !dynamic.contains("urls") {
+                self.project_url.clear();
+            }
+            if !dynamic.contains("license") {
+                self.license = None;
+                // Don't clear license_files as they may come from auto-discovery
+            }
+            if !dynamic.contains("classifiers") {
+                self.classifiers.clear();
+            }
+            if !dynamic.contains("readme") {
+                self.description = None;
+                self.description_content_type = None;
+            }
+            if !dynamic.contains("requires-python") {
+                self.requires_python = None;
+            }
+
             self.name.clone_from(&project.name);
 
             let version_ok = pyproject_toml.warn_invalid_version_info();
@@ -222,8 +258,11 @@ impl Metadata24 {
 
             if let Some(license) = &project.license {
                 match license {
-                    // TODO: switch to License-Expression core metadata, see https://peps.python.org/pep-0639/#add-license-expression-field
-                    License::Spdx(license_expr) => self.license = Some(license_expr.clone()),
+                    // PEP 639
+                    License::Spdx(license_expr) => {
+                        self.license_expression = Some(license_expr.clone())
+                    }
+                    // Deprecated by PEP 639
                     License::File { file } => {
                         self.license_files.push(file.to_path_buf());
                     }
@@ -548,6 +587,9 @@ impl Metadata24 {
         add_option("Author-email", &self.author_email);
         add_option("Maintainer", &self.maintainer);
         add_option("Maintainer-email", &self.maintainer_email);
+        // PEP 639
+        add_option("License-Expression", &self.license_expression);
+        // Deprecated by PEP 639
         add_option("License", &self.license.as_deref().map(fold_header));
         add_option(
             "Requires-Python",
@@ -681,6 +723,7 @@ mod test {
     use expect_test::{expect, Expect};
     use indoc::indoc;
     use pretty_assertions::assert_eq;
+    use tempfile::TempDir;
 
     fn assert_metadata_from_cargo_toml(
         readme: &str,
@@ -882,6 +925,23 @@ A test project
         );
     }
 
+    #[test]
+    fn test_pep639() {
+        let manifest_dir = PathBuf::from("test-crates").join("pyo3-mixed");
+        let cargo_metadata = MetadataCommand::new()
+            .manifest_path(manifest_dir.join("Cargo.toml"))
+            .exec()
+            .unwrap();
+        let mut metadata = Metadata24::from_cargo_toml(&manifest_dir, &cargo_metadata).unwrap();
+        let pyproject_toml = PyProjectToml::new(manifest_dir.join("pyproject.toml")).unwrap();
+        metadata
+            .merge_pyproject_toml(&manifest_dir, &pyproject_toml)
+            .unwrap();
+
+        assert_eq!(metadata.license_expression.as_ref().unwrap(), "MIT");
+        assert_eq!(metadata.license.as_ref(), None);
+    }
+
     #[test]
     fn test_merge_metadata_from_pyproject_dynamic_license_test() {
         let manifest_dir = PathBuf::from("test-crates").join("license-test");
@@ -948,4 +1008,149 @@ A test project
             assert_eq!(result, expected);
         }
     }
+
+    #[test]
+    fn test_issue_2544_respect_pyproject_dynamic_without_dynamic_fields() {
+        let temp_dir = TempDir::new().unwrap();
+        let crate_path = temp_dir.path();
+        let manifest_path = crate_path.join("Cargo.toml");
+        let pyproject_path = crate_path.join("pyproject.toml");
+
+        // Create basic src structure
+        fs::create_dir(crate_path.join("src")).unwrap();
+        fs::write(crate_path.join("src/lib.rs"), "").unwrap();
+
+        // Write Cargo.toml with metadata that should NOT be included
+        // because pyproject.toml doesn't declare them as dynamic
+        let cargo_toml = indoc!(
+            r#"
+            [package]
+            name = "test-package"
+            version = "0.1.0"
+            description = "Description from Cargo.toml - should not appear"
+            authors = ["author from cargo.toml <author@example.com>"]
+            keywords = ["cargo", "toml", "keyword"]
+            repository = "https://github.com/example/repo"
+
+            [lib]
+            crate-type = ["cdylib"]
+            "#
+        );
+        fs::write(&manifest_path, cargo_toml).unwrap();
+
+        // Write pyproject.toml WITHOUT declaring the fields as dynamic
+        let pyproject_toml_content = indoc!(
+            r#"
+            [build-system]
+            requires = ["maturin>=1.0,<2.0"]
+            build-backend = "maturin"
+
+            [project]
+            name = "test-package"
+            version = "0.1.0"
+            # Note: no description, authors, keywords, urls in dynamic list
+            # dynamic = []  # Not specified, so defaults to empty
+            "#
+        );
+        fs::write(&pyproject_path, pyproject_toml_content).unwrap();
+
+        // Load metadata as maturin does
+        let cargo_metadata = MetadataCommand::new()
+            .manifest_path(&manifest_path)
+            .exec()
+            .unwrap();
+        let mut metadata = Metadata24::from_cargo_toml(crate_path, &cargo_metadata).unwrap();
+        let pyproject_toml = PyProjectToml::new(&pyproject_path).unwrap();
+        metadata
+            .merge_pyproject_toml(crate_path, &pyproject_toml)
+            .unwrap();
+
+        assert_eq!(
+            metadata.summary, None,
+            "summary should be None when not in dynamic list"
+        );
+        assert_eq!(
+            metadata.author, None,
+            "author should be None when not in dynamic list"
+        );
+        assert_eq!(
+            metadata.keywords, None,
+            "keywords should be None when not in dynamic list"
+        );
+        assert!(
+            metadata.project_url.is_empty(),
+            "project_url should be empty when not in dynamic list"
+        );
+    }
+
+    #[test]
+    fn test_issue_2544_respect_pyproject_dynamic_with_dynamic_fields() {
+        let temp_dir = TempDir::new().unwrap();
+        let crate_path = temp_dir.path();
+        let manifest_path = crate_path.join("Cargo.toml");
+        let pyproject_path = crate_path.join("pyproject.toml");
+
+        // Create basic src structure
+        fs::create_dir(crate_path.join("src")).unwrap();
+        fs::write(crate_path.join("src/lib.rs"), "").unwrap();
+
+        // Write Cargo.toml with metadata
+        let cargo_toml = indoc!(
+            r#"
+            [package]
+            name = "test-package"
+            version = "0.1.0"
+            description = "Description from Cargo.toml - should appear"
+            authors = ["author from cargo.toml <author@example.com>"]
+            keywords = ["cargo", "toml", "keyword"]
+            repository = "https://github.com/example/repo"
+
+            [lib]
+            crate-type = ["cdylib"]
+            "#
+        );
+        fs::write(&manifest_path, cargo_toml).unwrap();
+
+        // Write pyproject.toml WITH fields declared as dynamic
+        let pyproject_toml_content = indoc!(
+            r#"
+            [build-system]
+            requires = ["maturin>=1.0,<2.0"]
+            build-backend = "maturin"
+
+            [project]
+            name = "test-package"
+            version = "0.1.0"
+            # Fields declared as dynamic - should come from Cargo.toml
+            dynamic = ["description", "authors", "keywords", "urls"]
+            "#
+        );
+        fs::write(&pyproject_path, pyproject_toml_content).unwrap();
+
+        // Load metadata as maturin does
+        let cargo_metadata = MetadataCommand::new()
+            .manifest_path(&manifest_path)
+            .exec()
+            .unwrap();
+        let mut metadata = Metadata24::from_cargo_toml(crate_path, &cargo_metadata).unwrap();
+        let pyproject_toml = PyProjectToml::new(&pyproject_path).unwrap();
+        metadata
+            .merge_pyproject_toml(crate_path, &pyproject_toml)
+            .unwrap();
+
+        // These fields SHOULD be set because they are in dynamic list
+        assert_eq!(
+            metadata.summary,
+            Some("Description from Cargo.toml - should appear".to_string())
+        );
+        assert_eq!(
+            metadata.author,
+            Some("author from cargo.toml <author@example.com>".to_string())
+        );
+        assert_eq!(metadata.keywords, Some("cargo,toml,keyword".to_string()));
+        assert_eq!(
+            metadata.project_url.get("Source Code"),
+            Some(&"https://github.com/example/repo".to_string())
+        );
+    }
 }

{maturin-1.9.1 → maturin-1.9.3}/src/new_project.rs

@@ -301,23 +301,20 @@ mod package_name_validations {
         }
         if ["core", "std", "alloc", "proc_macro", "proc-macro"].contains(&name) {
             eprintln!(
-                "⚠️  Warning: the name `{}` is part of Rust's standard library\n\
+                "⚠️  Warning: the name `{name}` is part of Rust's standard library\n\
                 It is recommended to use a different name to avoid problems.",
-                name,
             );
         }
         if is_windows_reserved(name) {
             eprintln!(
-                "⚠️  Warning: the name `{}` is a reserved Windows filename\n\
+                "⚠️  Warning: the name `{name}` is a reserved Windows filename\n\
                 This package will not work on Windows platforms.",
-                name
             );
         }
         if is_non_ascii_name(name) {
             eprintln!(
-                "⚠️  Warning: the name `{}` contains non-ASCII characters\n\
+                "⚠️  Warning: the name `{name}` contains non-ASCII characters\n\
                 Non-ASCII crate names are not supported by Rust.",
-                name
             );
         }
         let name_in_lowercase = name.to_lowercase();

{maturin-1.9.1 → maturin-1.9.3}/src/pyproject_toml.rs

@@ -379,10 +379,7 @@ impl PyProjectToml {
                     if !version_specifier.contains(&self_version) {
                         eprintln!(
                             "⚠️  Warning: You specified {requires_maturin} in pyproject.toml under \
-                            `build-system.requires`, but the current {maturin} version is {version}",
-                            requires_maturin = requires_maturin,
-                            maturin = maturin,
-                            version = self_version,
+                            `build-system.requires`, but the current {maturin} version is {self_version}",
                         );
                         return false;
                     }

{maturin-1.9.1 → maturin-1.9.3}/src/source_distribution.rs

@@ -8,7 +8,8 @@ use fs_err as fs;
 use ignore::overrides::Override;
 use normpath::PathExt as _;
 use path_slash::PathExt as _;
-use std::collections::HashMap;
+use pyproject_toml::check_pep639_glob;
+use std::collections::{HashMap, HashSet};
 use std::ffi::OsStr;
 use std::io::Write;
 use std::path::{Path, PathBuf};
@@ -25,7 +26,7 @@ use tracing::{debug, trace};
 /// foo = { path = "path/to/foo" }
 /// ```
 #[derive(Debug, Clone)]
-struct PathDependency {
+pub struct PathDependency {
     /// `Cargo.toml` path of the path dependency
     manifest_path: PathBuf,
     /// workspace root of the path dependency
@@ -307,7 +308,7 @@ fn add_crate_to_source_distribution(
 }
 
 /// Finds all path dependencies of the crate
-fn find_path_deps(cargo_metadata: &Metadata) -> Result<HashMap<String, PathDependency>> {
+pub fn find_path_deps(cargo_metadata: &Metadata) -> Result<HashMap<String, PathDependency>> {
     let root = cargo_metadata
         .root_package()
         .context("Expected the dependency graph to have a root package")?;
@@ -370,8 +371,7 @@ fn find_path_deps(cargo_metadata: &Metadata) -> Result<HashMap<String, PathDepen
                     .exec()
                     .with_context(|| {
                         format!(
-                            "Failed to resolve workspace root for {} at '{}'",
-                            dep_id, dep_manifest_path
+                            "Failed to resolve workspace root for {dep_id} at '{dep_manifest_path}'"
                         )
                     })?;
 
@@ -481,7 +481,7 @@ fn add_cargo_package_files_to_sdist(
             name,
             path_dep,
         )
-        .with_context(|| format!("Failed to add path dependency {}", name))?;
+        .with_context(|| format!("Failed to add path dependency {name}"))?;
     }
 
     debug!("Adding the main crate {}", manifest_path.display());
@@ -502,17 +502,8 @@ fn add_cargo_package_files_to_sdist(
         .unwrap()
         .strip_prefix(&sdist_root)
         .unwrap();
-    add_crate_to_source_distribution(
-        writer,
-        manifest_path,
-        root_dir.join(relative_main_crate_manifest_dir),
-        None,
-        &known_path_deps,
-        true,
-        false,
-    )?;
     // Handle possible relative readme field in Cargo.toml
-    if let Some(readme) = main_crate.readme.as_ref() {
+    let readme_path = if let Some(readme) = main_crate.readme.as_ref() {
         let readme = abs_manifest_dir.join(readme);
         let abs_readme = readme
             .normalize()
@@ -531,7 +522,19 @@ fn add_cargo_package_files_to_sdist(
                 .join(readme.file_name().unwrap()),
             &abs_readme,
         )?;
-    }
+        Some(abs_readme)
+    } else {
+        None
+    };
+    add_crate_to_source_distribution(
+        writer,
+        manifest_path,
+        root_dir.join(relative_main_crate_manifest_dir),
+        readme_path.as_deref(),
+        &known_path_deps,
+        true,
+        false,
+    )?;
 
     // Add Cargo.lock file and workspace Cargo.toml
     let manifest_cargo_lock_path = abs_manifest_dir.join("Cargo.lock");
@@ -786,6 +789,34 @@ pub fn source_distribution(
         if let Some(pyproject_toml::License::File { file }) = project.license.as_ref() {
             writer.add_file(root_dir.join(file), pyproject_dir.join(file))?;
         }
+        if let Some(license_files) = &project.license_files {
+            // Safe on Windows and Unix as neither forward nor backwards slashes are escaped.
+            let escaped_pyproject_dir =
+                PathBuf::from(glob::Pattern::escape(pyproject_dir.to_str().unwrap()));
+            let mut seen = HashSet::new();
+            for license_glob in license_files {
+                check_pep639_glob(license_glob)?;
+                for license_path in
+                    glob::glob(&escaped_pyproject_dir.join(license_glob).to_string_lossy())?
+                {
+                    let license_path = license_path?;
+                    if !license_path.is_file() {
+                        continue;
+                    }
+                    let license_path = license_path
+                        .strip_prefix(pyproject_dir)
+                        .expect("matched path starts with glob root")
+                        .to_path_buf();
+                    if seen.insert(license_path.clone()) {
+                        debug!("Including license file `{}`", license_path.display());
+                        writer.add_file(
+                            root_dir.join(&license_path),
+                            pyproject_dir.join(&license_path),
+                        )?;
+                    }
+                }
+            }
+        }
     }
 
     let mut include = |pattern| -> Result<()> {

{maturin-1.9.1 → maturin-1.9.3}/src/target/legacy_py.rs

@@ -57,7 +57,7 @@ pub(super) static IOS_ARCHES: &[&str] = &["arm64", "x86_64"];
 pub(super) static ANDROID_ARCHES: &[&str] = &["armeabi_v7a", "arm64_v8a", "x86", "x86_64"];
 
 pub(super) static MANYLINUX_ARCHES: &[&str] = &[
-    "x86_64", "i686", "aarch64", "armv7l", "ppc64le", "s390x", "ppc64",
+    "x86_64", "i686", "aarch64", "armv7l", "ppc64le", "s390x", "ppc64", "riscv64",
 ];
 
 pub(super) static MUSLLINUX_ARCHES: &[&str] =

{maturin-1.9.1 → maturin-1.9.3}/src/target/pypi_tags.rs

@@ -78,6 +78,7 @@ pub fn is_arch_supported_by_pypi(target: &Target) -> bool {
 /// Validates that a wheel platform tag is allowed by PyPI.
 ///
 /// Based on PyPI warehouse platform tag validation logic.
+///
 fn is_platform_tag_allowed_by_pypi(platform_tag: &str) -> bool {
     // Covers old Windows and old manylinux tags.
     if ALLOWED_PLATFORMS.contains(&platform_tag) {
@@ -170,7 +171,8 @@ mod tests {
             // manylinux platforms
             ("manylinux2014_x86_64", true),
             ("manylinux_2_17_aarch64", true),
-            ("manylinux_2_17_riscv64", false),
+            ("manylinux_2_17_riscv64", true),
+            ("manylinux_2_39_riscv64", true),
             // musllinux platforms
             ("musllinux_1_1_x86_64", true),
             ("musllinux_1_1_riscv64", false),
@@ -222,12 +224,12 @@ mod tests {
             ("x86_64-unknown-linux-gnu", true),
             ("aarch64-linux-android", true),
             ("armv7-linux-androideabi", true),
-            ("riscv64gc-unknown-linux-gnu", false), // Unsupported
-            ("x86_64-unknown-freebsd", false),      // Now unsupported (no lazy validation)
-            ("powerpc64-unknown-linux-gnu", true),  // PPC64 on Linux is supported
-            ("s390x-unknown-linux-gnu", true),      // s390x on Linux is supported
-            ("wasm32-unknown-emscripten", false),   // Emscripten is unsupported
-            ("i686-pc-windows-msvc", true),         // i686 Windows is supported
+            ("riscv64gc-unknown-linux-gnu", true),
+            ("x86_64-unknown-freebsd", false), // Now unsupported (no lazy validation)
+            ("powerpc64-unknown-linux-gnu", true), // PPC64 on Linux is supported
+            ("s390x-unknown-linux-gnu", true), // s390x on Linux is supported
+            ("wasm32-unknown-emscripten", false), // Emscripten is unsupported
+            ("i686-pc-windows-msvc", true),    // i686 Windows is supported
         ];
 
         for (triple, expected) in targets {

{maturin-1.9.1 → maturin-1.9.3}/src/upload.rs

@@ -225,7 +225,7 @@ fn resolve_pypi_cred(
             return Ok(("__token__".to_string(), token));
         }
         Ok(None) => {}
-        Err(e) => eprintln!("⚠️ Warning: Failed to resolve PyPI token via OIDC: {}", e),
+        Err(e) => eprintln!("⚠️ Warning: Failed to resolve PyPI token via OIDC: {e}"),
     }
 
     if let Some((username, password)) =