The package rpms/rust-isal-sys.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/rust-isal-sys.git/commit/?id=bbc46f9....
Change: -ExcludeArch: %{ix86}
Thanks.
Full change: ============
commit bbc46f9846095929c3164a534e6dd70db6e36fd0 Author: Benjamin A. Beasley code@musicinmybrain.net Date: Tue Feb 25 10:10:22 2025 -0500
No longer required for rust-libcramjam-0.7 (experimental features disabled), and rust-libcramjam0.6 is now retired. Furthermore, there are unresolved test failures with current isa-l releases, https://github.com/milesgranger/isal-rs/issues/31.
diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 4f8f052..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/isal-sys-0.5.3+496255c.crate diff --git a/0001-Downstream-only-always-use-the-system-isa-l-shared-l.patch b/0001-Downstream-only-always-use-the-system-isa-l-shared-l.patch deleted file mode 100644 index 6bc89d0..0000000 --- a/0001-Downstream-only-always-use-the-system-isa-l-shared-l.patch +++ /dev/null @@ -1,174 +0,0 @@ -From 7774f87f17effff3affa6d04a7e9f7b5a8b5ade1 Mon Sep 17 00:00:00 2001 -From: "Benjamin A. Beasley" code@musicinmybrain.net -Date: Fri, 4 Oct 2024 13:28:53 -0400 -Subject: [PATCH] Downstream-only: always use the system isa-l shared library - and regenerate bindings - ---- - build.rs | 122 ++--------------------------------------------- - src/igzip_lib.rs | 6 +-- - 2 files changed, 7 insertions(+), 121 deletions(-) - -diff --git a/build.rs b/build.rs -index b439804..dfe9780 100644 ---- a/build.rs -+++ b/build.rs -@@ -1,131 +1,17 @@ - use std::path::PathBuf; --use std::{ -- io::{self, Write}, -- process::{Command, Stdio}, --}; - - fn main() { -+ // Downstream patch: always use the system shared library, and always regenerate bindings. - println!("cargo:rerun-if-changed=build.rs"); -+ println!("cargo:rustc-link-lib=isal"); - -- let is_static = cfg!(feature = "static"); -- let is_shared = cfg!(feature = "shared"); -- let target = std::env::var("TARGET").unwrap(); -- let out_dir = PathBuf::from(&std::env::var("OUT_DIR").unwrap()); -- -- // Copy isa-l source into out; not allow to modify things outside of out dir -- let src_dir = out_dir.join("isa-l"); -- if src_dir.exists() { -- std::fs::remove_dir_all(&src_dir).unwrap(); // maybe from a previous build -- } -- copy_dir::copy_dir("isa-l", &src_dir).unwrap(); -- -- let install_path = std::env::var("ISAL_INSTALL_PREFIX") -- .map(|p| PathBuf::from(&p).clone()) -- .unwrap_or(out_dir.clone()); -- -- let current_dir = std::env::current_dir().unwrap(); -- std::env::set_current_dir(&src_dir).unwrap(); -- -- // build from source -- #[cfg(not(feature = "use-system-isal"))] -- { -- #[cfg(not(target_os = "windows"))] -- let cmd = { -- let status = Command::new("./autogen.sh") -- .stdout(Stdio::piped()) -- .stderr(Stdio::piped()) -- .output() -- .unwrap(); -- io::stdout().write_all(&status.stdout).unwrap(); -- io::stderr().write_all(&status.stderr).unwrap(); -- if !status.status.success() { -- panic!("autogen failed"); -- } -- -- let compiler = cc::Build::new().get_compiler(); -- let cflags = compiler.cflags_env().into_string().unwrap(); -- -- let mut configure_args = vec![ -- format!("--prefix={}", install_path.display()), -- format!("--host={}", target), -- format!("--enable-static={}", if is_static { "yes" } else { "no" }), -- format!("--enable-shared={}", if is_shared { "yes" } else { "no" }), -- format!("CFLAGS={}", cflags), -- format!("CC={}", compiler.path().display()), -- ]; -- -- if !cfg!(target_os = "macos") { -- let ldflag = if is_static { "static" } else { "shared" }; -- configure_args.push(format!("LDFLAGS=-{}", ldflag)); -- configure_args.push("--with-pic=yes".to_string()); -- } -- -- let status = Command::new("./configure") -- .args(&configure_args) -- .stdout(Stdio::piped()) -- .stderr(Stdio::piped()) -- .output() -- .unwrap(); -- io::stdout().write_all(&status.stdout).unwrap(); -- io::stderr().write_all(&status.stderr).unwrap(); -- if !status.status.success() { -- panic!("configure failed"); -- } -- -- Command::new("make") -- .args(&["install-libLTLIBRARIES"]) -- .stdout(Stdio::piped()) -- .stderr(Stdio::piped()) -- .spawn() -- }; -- -- #[cfg(target_os = "windows")] -- let mut cmd = { -- Command::new("nmake") -- .args(["-f", "Makefile.nmake"]) -- .stdout(Stdio::piped()) -- .stderr(Stdio::piped()) -- .spawn() -- }; -- -- std::env::set_current_dir(¤t_dir).unwrap(); -- -- let output = cmd.unwrap().wait_with_output().unwrap(); -- io::stdout().write_all(&output.stdout).unwrap(); -- io::stderr().write_all(&output.stderr).unwrap(); -- if !output.status.success() { -- panic!("Building isa-l failed"); -- } -- } -- -- let libname = if cfg!(target_os = "windows") { -- println!("cargo:rustc-link-search=native={}", src_dir.display()); -- if cfg!(feature = "static") { -- "isa-l_static" -- } else { -- "isa-l" -- } -- } else { -- for subdir in ["bin", "lib", "lib64"] { -- let search_path = install_path.join(subdir); -- println!("cargo:rustc-link-search=native={}", search_path.display()); -- } -- "isal" -- }; -- -- #[cfg(feature = "static")] -- println!("cargo:rustc-link-lib=static={}", libname); -- -- #[cfg(feature = "shared")] -- println!("cargo:rustc-link-lib={}", libname); -- -- #[cfg(feature = "regenerate-bindings")] - { - let out = PathBuf::from(&(format!("{}/igzip_lib.rs", std::env::var("OUT_DIR").unwrap()))); - bindgen::Builder::default() - // The input header we would like to generate - // bindings for. -- .header("isa-l/include/igzip_lib.h") -+ // Downstream patch: use the system header. -+ .header("/usr/include/isa-l/igzip_lib.h") - // Tell cargo to invalidate the built crate whenever any of the - // included header files changed. - .parse_callbacks(Box::new(bindgen::CargoCallbacks::new())) -diff --git a/src/igzip_lib.rs b/src/igzip_lib.rs -index dff227e..c6cbe31 100644 ---- a/src/igzip_lib.rs -+++ b/src/igzip_lib.rs -@@ -1,12 +1,12 @@ - pub use bindings::*; - --#[cfg(feature = "regenerate-bindings")] -+// Downstream patch: always regenerate bindings - pub mod bindings { - include!(concat!(env!("OUT_DIR"), "/igzip_lib.rs")); - } - --// copy from target dir when updating bindings --#[cfg(not(feature = "regenerate-bindings"))] -+// Downstream patch: always regenerate bindings. cfg(any()) is false -+#[cfg(any())] - pub mod bindings { - /* automatically generated by rust-bindgen 0.69.4 */ - --- -2.46.1 - diff --git a/README.md b/README.md deleted file mode 100644 index 157363c..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-isal-sys - -The rust-isal-sys package diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..f5f2bf7 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +No longer required for rust-libcramjam-0.7 (experimental features disabled), and rust-libcramjam0.6 is now retired. Furthermore, there are unresolved test failures with current isa-l releases, https://github.com/milesgranger/isal-rs/issues/31. diff --git a/isal-sys-fix-metadata-auto.diff b/isal-sys-fix-metadata-auto.diff deleted file mode 100644 index a3d530a..0000000 --- a/isal-sys-fix-metadata-auto.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- isal-sys-0.5.3+496255c/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ isal-sys-0.5.3+496255c/Cargo.toml 2024-10-15T11:25:03.536732+00:00 -@@ -12,7 +12,7 @@ - [package] - edition = "2021" - name = "isal-sys" --version = "0.5.3+496255c" -+version = "0.5.3" - authors = ["Miles Granger miles59923@gmail.com"] - build = "build.rs" - autobins = false -@@ -48,3 +48,4 @@ - shared = [] - static = [] - use-system-isal = [] -+ diff --git a/isal-sys-fix-metadata.diff b/isal-sys-fix-metadata.diff deleted file mode 100644 index 4ece1df..0000000 --- a/isal-sys-fix-metadata.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- isal-sys-0.5.3+496255c/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ isal-sys-0.5.3+496255c/Cargo.toml 2024-10-15T11:25:32.697092+00:00 -@@ -34,7 +34,6 @@ - - [build-dependencies.bindgen] - version = "^0.69" --optional = true - - [build-dependencies.cc] - version = "^1" -@@ -43,9 +42,8 @@ - version = "0.1.3" - - [features] --default = ["static"] --regenerate-bindings = ["dep:bindgen"] -+default = ["shared"] -+regenerate-bindings = [] - shared = [] --static = [] - use-system-isal = [] - diff --git a/rust-isal-sys.rpmlintrc b/rust-isal-sys.rpmlintrc deleted file mode 100644 index b3cc95e..0000000 --- a/rust-isal-sys.rpmlintrc +++ /dev/null @@ -1,4 +0,0 @@ -# Feature metapackages are not supposed to have documentation! -addFilter(r"+[-_\w]+-devel.noarch: W: no-documentation") -# We did not miss anything; there is nothing to include here. -addFilter(r"rust-isal-sys-devel.noarch: W: no-documentation") diff --git a/rust-isal-sys.spec b/rust-isal-sys.spec deleted file mode 100644 index 9fd3b45..0000000 --- a/rust-isal-sys.spec +++ /dev/null @@ -1,132 +0,0 @@ -# Generated by rust2rpm 26 -%bcond_without check -%global debug_package %{nil} - -%global crate isal-sys -%global upstream_version 0.5.3+496255c - -Name: rust-isal-sys -Version: 0.5.3 -Release: %autorelease -Summary: Isa-l sys crate - -License: BSD-3-Clause -URL: https://crates.io/crates/isal-sys -Source: %{crates_source %{crate} %{upstream_version}} -# Automatically generated patch to strip dependencies and normalize metadata -Patch: isal-sys-fix-metadata-auto.diff -# Manually created patch for downstream crate metadata changes -# * Remove the static feature, and replace it with shared in the default -# features -# * Make bindgen non-optional -Patch: isal-sys-fix-metadata.diff -# * Downstream-only: always use the system isa-l shared library and regenerate -# bindings -Patch10: 0001-Downstream-only-always-use-the-system-isa-l-shared-l.patch - -# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval -# Additionally, the isa-l package is ExcludeArch: %%{ix86}. -ExcludeArch: %{ix86} - -BuildRequires: cargo-rpm-macros >= 24 -BuildRequires: tomcli -BuildRequires: isa-l-devel - -%global _description %{expand: -Isa-l sys crate.} - -%description %{_description} - -%package devel -Summary: %{summary} -BuildArch: noarch -Requires: isa-l-devel - -%description devel %{_description} - -This package contains library source intended for building other packages which -use the "%{crate}" crate. - -%files devel -%license %{crate_instdir}/LICENSE -%{crate_instdir}/ - -%package -n %{name}+default-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+default-devel %{_description} - -This package contains library source intended for building other packages which -use the "default" feature of the "%{crate}" crate. - -%files -n %{name}+default-devel -%ghost %{crate_instdir}/Cargo.toml - -%package -n %{name}+regenerate-bindings-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+regenerate-bindings-devel %{_description} - -This package contains library source intended for building other packages which -use the "regenerate-bindings" feature of the "%{crate}" crate. - -%files -n %{name}+regenerate-bindings-devel -%ghost %{crate_instdir}/Cargo.toml - -%package -n %{name}+shared-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+shared-devel %{_description} - -This package contains library source intended for building other packages which -use the "shared" feature of the "%{crate}" crate. - -%files -n %{name}+shared-devel -%ghost %{crate_instdir}/Cargo.toml - -%package -n %{name}+use-system-isal-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+use-system-isal-devel %{_description} - -This package contains library source intended for building other packages which -use the "use-system-isal" feature of the "%{crate}" crate. - -%files -n %{name}+use-system-isal-devel -%ghost %{crate_instdir}/Cargo.toml - -%prep -%autosetup -n %{crate}-%{upstream_version} -p1 -# Remove the bundled copy of isa-l -rm -rv isa-l - -# These would only be needed to build the bundled isa-l: -tomcli set Cargo.toml del build-dependencies.cc -tomcli set Cargo.toml del build-dependencies.copy_dir - -# To be more pedantically correct, replace the hard-coded /usr/include patched -# into build.rs with the expansion of %%{_includedir}. -sed -r -i 's@/usr/include\b@%{_includedir}@' build.rs - -%cargo_prep - -%generate_buildrequires -%cargo_generate_buildrequires - -%build -%cargo_build - -%install -%cargo_install - -%if %{with check} -%check -%cargo_test -%endif - -%changelog -%autochangelog diff --git a/rust2rpm.toml b/rust2rpm.toml deleted file mode 100644 index 7d7cf03..0000000 --- a/rust2rpm.toml +++ /dev/null @@ -1,41 +0,0 @@ - -[requires] -build = [ - "tomcli", - # This is not pkgconfig(libisal) because we do not use pkg-config to find - # the library. - "isa-l-devel", -] -lib = [ - "isa-l-devel", -] - -[package] -cargo-toml-patch-comments = [ - "Remove the static feature, and replace it with shared in the default features", - "Make bindgen non-optional", -] - -[[package.extra-patches]] -number = 10 -# Export from git with "cd isal-sys; git format-patch --relative [...]” -file = "0001-Downstream-only-always-use-the-system-isa-l-shared-l.patch" -comments = [ - "Downstream-only: always use the system isa-l shared library and regenerate bindings", -] - -[scripts.prep] -pre = [ - ''' -# Remove the bundled copy of isa-l -rm -rv isa-l - -# These would only be needed to build the bundled isa-l: -tomcli set Cargo.toml del build-dependencies.cc -tomcli set Cargo.toml del build-dependencies.copy_dir - -# To be more pedantically correct, replace the hard-coded /usr/include patched -# into build.rs with the expansion of %%{_includedir}. -sed -r -i 's@/usr/include\b@%{_includedir}@' build.rs -''' -] diff --git a/sources b/sources deleted file mode 100644 index 5a25172..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (isal-sys-0.5.3+496255c.crate) = 169ccecbce67dfc1f2bd47fe39ab5eba1be1a9ce639ec4f516ff598953f8681f2c616c08c0ee9120acfb72b7dff3a9a8ecc186acce8f5af7983396e1259469a1
arch-excludes@lists.fedoraproject.org