rpms
/
rust-libz-sys
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

import rust-libz-sys-1.1.12-1.el9

Browse Source
i9ce changed/i9ce/rust-libz-sys-1.1.12-1.el9
Arkady L. Shane 1 year ago
commit 9e43b49204
Signed by: tigro
GPG Key ID: 8D1597B4AD3AFAA0
5 changed files with 530 additions and 0 deletions
Show Stats Download Patch File Download Diff File

0
.rust-libz-sys.metadata
Unescape View File

277
SOURCES/0001-unconditionally-use-pkg-config-to-link-with-system-z.patch
Unescape View File

@ -0,0 +1,277 @@
From 1d8cd791f014ff2a3e043730eaaaf3b7c5be114f Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Sat, 29 Jul 2023 16:48:39 +0200
Subject: [PATCH] unconditionally use pkg-config to link with system zlib
---
build.rs | 188 ++-------------------------------------------------
build_zng.rs | 60 ----------------
2 files changed, 5 insertions(+), 243 deletions(-)
delete mode 100644 build_zng.rs
diff --git a/build.rs b/build.rs
index 51ebe6b..8d1acf7 100644
--- a/build.rs
+++ b/build.rs
@@ -1,187 +1,9 @@
-use std::env;
-use std::fs;
-use std::path::PathBuf;
-
fn main() {
- println!("cargo:rerun-if-env-changed=LIBZ_SYS_STATIC");
println!("cargo:rerun-if-changed=build.rs");
- let host = env::var("HOST").unwrap();
- let target = env::var("TARGET").unwrap();
-
- let host_and_target_contain = |s| host.contains(s) && target.contains(s);
-
- let want_ng = cfg!(feature = "zlib-ng") && !cfg!(feature = "stock-zlib");
-
- if want_ng && target != "wasm32-unknown-unknown" {
- return build_zlib_ng(&target, true);
- }
-
- // Don't run pkg-config if we're linking statically (we'll build below) and
- // also don't run pkg-config on FreeBSD/DragonFly. That'll end up printing
- // `-L /usr/lib` which wreaks havoc with linking to an OpenSSL in /usr/local/lib
- // (Ports, etc.)
- let want_static =
- cfg!(feature = "static") || env::var("LIBZ_SYS_STATIC").unwrap_or(String::new()) == "1";
- if !want_static &&
- !target.contains("msvc") && // pkg-config just never works here
- !(host_and_target_contain("freebsd") ||
- host_and_target_contain("dragonfly"))
- {
- // Don't print system lib dirs to cargo since this interferes with other
- // packages adding non-system search paths to link against libraries
- // that are also found in a system-wide lib dir.
- let zlib = pkg_config::Config::new()
- .cargo_metadata(true)
- .print_system_libs(false)
- .probe("zlib");
- match zlib {
- Ok(_) => return,
- Err(e) => {
- println!("cargo-warning={}", e.to_string())
- }
- }
- }
-
- if target.contains("windows") {
- if try_vcpkg() {
- return;
- }
- }
-
- // All android compilers should come with libz by default, so let's just use
- // the one already there. Likewise, Haiku always ships with libz, so we can
- // link to it even when cross-compiling.
- if target.contains("android") || target.contains("haiku") {
- println!("cargo:rustc-link-lib=z");
- return;
- }
-
- let mut cfg = cc::Build::new();
-
- // Situations where we build unconditionally.
- //
- // MSVC basically never has it preinstalled, MinGW picks up a bunch of weird
- // paths we don't like, `want_static` may force us, and cross compiling almost
- // never has a prebuilt version.
- //
- // Apple platforms have libz.1.dylib, and it's usually available even when
- // cross compiling (via fat binary or in the target's Xcode SDK)
- let cross_compiling = target != host;
- let apple_to_apple = host.contains("-apple-") && target.contains("-apple-");
- if target.contains("msvc")
- || target.contains("pc-windows-gnu")
- || want_static
- || (cross_compiling && !apple_to_apple)
- {
- return build_zlib(&mut cfg, &target);
- }
-
- // If we've gotten this far we're probably a pretty standard platform.
- // Almost all platforms here ship libz by default, but some don't have
- // pkg-config files that we would find above.
- //
- // In any case test if zlib is actually installed and if so we link to it,
- // otherwise continue below to build things.
- if zlib_installed(&mut cfg) {
- println!("cargo:rustc-link-lib=z");
- return;
- }
-
- build_zlib(&mut cfg, &target)
-}
-
-fn build_zlib(cfg: &mut cc::Build, target: &str) {
- let dst = PathBuf::from(env::var_os("OUT_DIR").unwrap());
- let lib = dst.join("lib");
-
- cfg.warnings(false).out_dir(&lib).include("src/zlib");
-
- cfg.file("src/zlib/adler32.c")
- .file("src/zlib/compress.c")
- .file("src/zlib/crc32.c")
- .file("src/zlib/deflate.c")
- .file("src/zlib/infback.c")
- .file("src/zlib/inffast.c")
- .file("src/zlib/inflate.c")
- .file("src/zlib/inftrees.c")
- .file("src/zlib/trees.c")
- .file("src/zlib/uncompr.c")
- .file("src/zlib/zutil.c");
-
- if !cfg!(feature = "libc") || target.starts_with("wasm32") {
- cfg.define("Z_SOLO", None);
- } else {
- cfg.file("src/zlib/gzclose.c")
- .file("src/zlib/gzlib.c")
- .file("src/zlib/gzread.c")
- .file("src/zlib/gzwrite.c");
- }
-
- if !target.contains("windows") {
- cfg.define("STDC", None);
- cfg.define("_LARGEFILE64_SOURCE", None);
- cfg.define("_POSIX_SOURCE", None);
- cfg.flag("-fvisibility=hidden");
- }
- if target.contains("apple") {
- cfg.define("_C99_SOURCE", None);
- }
- if target.contains("solaris") {
- cfg.define("_XOPEN_SOURCE", "700");
- }
-
- cfg.compile("z");
-
- fs::create_dir_all(dst.join("include")).unwrap();
- fs::copy("src/zlib/zlib.h", dst.join("include/zlib.h")).unwrap();
- fs::copy("src/zlib/zconf.h", dst.join("include/zconf.h")).unwrap();
-
- fs::create_dir_all(lib.join("pkgconfig")).unwrap();
- fs::write(
- lib.join("pkgconfig/zlib.pc"),
- fs::read_to_string("src/zlib/zlib.pc.in")
- .unwrap()
- .replace("@prefix@", dst.to_str().unwrap()),
- )
- .unwrap();
-
- println!("cargo:root={}", dst.to_str().unwrap());
- println!("cargo:rustc-link-search=native={}", lib.to_str().unwrap());
- println!("cargo:include={}/include", dst.to_str().unwrap());
-}
-
-#[cfg(not(feature = "zlib-ng"))]
-fn build_zlib_ng(_target: &str, _compat: bool) {}
-
-#[cfg(feature = "zlib-ng")]
-mod build_zng;
-#[cfg(feature = "zlib-ng")]
-use build_zng::build_zlib_ng;
-
-fn try_vcpkg() -> bool {
- // see if there is a vcpkg tree with zlib installed
- match vcpkg::Config::new()
- .emit_includes(true)
- .find_package("zlib")
- {
- Ok(_) => true,
- Err(e) => {
- println!("note, vcpkg did not find zlib: {}", e);
- false
- }
- }
-}
-
-fn zlib_installed(cfg: &mut cc::Build) -> bool {
- let mut cmd = cfg.get_compiler().to_command();
- cmd.arg("src/smoke.c").arg("-o").arg("/dev/null").arg("-lz");
-
- println!("running {:?}", cmd);
- if let Ok(status) = cmd.status() {
- if status.success() {
- return true;
- }
- }
- false
+ pkg_config::Config::new()
+ .cargo_metadata(true)
+ .print_system_libs(false)
+ .probe("zlib")
+ .unwrap();
}
diff --git a/build_zng.rs b/build_zng.rs
deleted file mode 100644
index 2557625..0000000
--- a/build_zng.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-use std::env;
-
-pub fn build_zlib_ng(target: &str, compat: bool) {
- let mut cmake = cmake::Config::new("src/zlib-ng");
- cmake
- .define("BUILD_SHARED_LIBS", "OFF")
- .define("ZLIB_COMPAT", if compat { "ON" } else { "OFF" })
- .define("ZLIB_ENABLE_TESTS", "OFF")
- .define("WITH_GZFILEOP", "ON");
- if target.contains("s390x") {
- // Enable hardware compression on s390x.
- cmake
- .define("WITH_DFLTCC_DEFLATE", "1")
- .define("WITH_DFLTCC_INFLATE", "1")
- .cflag("-DDFLTCC_LEVEL_MASK=0x7e");
- }
- if target == "i686-pc-windows-msvc" {
- cmake.define("CMAKE_GENERATOR_PLATFORM", "Win32");
- }
-
- let install_dir = cmake.build();
-
- let includedir = install_dir.join("include");
- let libdir = install_dir.join("lib");
- let libdir64 = install_dir.join("lib64");
- println!(
- "cargo:rustc-link-search=native={}",
- libdir.to_str().unwrap()
- );
- println!(
- "cargo:rustc-link-search=native={}",
- libdir64.to_str().unwrap()
- );
- let mut debug_suffix = "";
- let libname = if target.contains("windows") && target.contains("msvc") {
- if env::var("OPT_LEVEL").unwrap() == "0" {
- debug_suffix = "d";
- }
- "zlibstatic"
- } else {
- "z"
- };
- println!(
- "cargo:rustc-link-lib=static={}{}{}",
- libname,
- if compat { "" } else { "-ng" },
- debug_suffix,
- );
- println!("cargo:root={}", install_dir.to_str().unwrap());
- println!("cargo:include={}", includedir.to_str().unwrap());
- if !compat {
- println!("cargo:rustc-cfg=zng");
- }
-}
-
-#[allow(dead_code)]
-fn main() {
- let target = env::var("TARGET").unwrap();
- build_zlib_ng(&target, false);
-}
--
2.41.0

BIN
SOURCES/libz-sys-1.1.12.crate
View File

Binary file not shown.

28
SOURCES/libz-sys-fix-metadata.diff
Unescape View File

@ -0,0 +1,28 @@
--- libz-sys-1.1.12/Cargo.toml 1970-01-01T00:00:01+00:00
+++ libz-sys-1.1.12/Cargo.toml 2023-07-29T14:43:10.223812+00:00
@@ -47,25 +47,12 @@
[build-dependencies.cc]
version = "1.0.18"
-[build-dependencies.cmake]
-version = "0.1.44"
-optional = true
-
[build-dependencies.pkg-config]
version = "0.3.9"
-[build-dependencies.vcpkg]
-version = "0.2"
-
[features]
-asm = []
default = [
"libc",
"stock-zlib",
]
-static = []
stock-zlib = []
-zlib-ng = [
- "libc",
- "cmake",
-]

225
SPECS/rust-libz-sys.spec
Unescape View File

@ -0,0 +1,225 @@
## START: Set by rpmautospec
## (rpmautospec version 0.3.5)
## RPMAUTOSPEC: autorelease, autochangelog
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
release_number = 1;
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
print(release_number + base_release_number - 1);
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
## END: Set by rpmautospec
# Generated by rust2rpm 24
%bcond_without check
%global debug_package %{nil}
%global crate libz-sys
Name: rust-libz-sys
Version: 1.1.12
Release: %autorelease
Summary: Low-level bindings to the system libz library (also known as zlib)
License: MIT OR Apache-2.0
URL: https://crates.io/crates/libz-sys
Source: %{crates_source}
# Manually created patch for downstream crate metadata changes
# * drop features for zlib-ng, static linking, and unavailalbe asm optimizations
Patch: libz-sys-fix-metadata.diff
# * remove code related to building vendored zlib / zlib-ng sources
# * unconditionally use pkg-config to link with system libz
Patch: 0001-unconditionally-use-pkg-config-to-link-with-system-z.patch
BuildRequires: rust-packaging >= 21
%global _description %{expand:
Low-level bindings to the system libz library (also known as zlib).}
%description %{_description}
%package devel
Summary: %{summary}
BuildArch: noarch
Requires: pkgconfig(zlib)
%description devel %{_description}
This package contains library source intended for building other packages which
use the "%{crate}" crate.
%files devel
%license %{crate_instdir}/LICENSE-APACHE
%license %{crate_instdir}/LICENSE-MIT
%doc %{crate_instdir}/README.md
%{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}+libc-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+libc-devel %{_description}
This package contains library source intended for building other packages which
use the "libc" feature of the "%{crate}" crate.
%files -n %{name}+libc-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+stock-zlib-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+stock-zlib-devel %{_description}
This package contains library source intended for building other packages which
use the "stock-zlib" feature of the "%{crate}" crate.
%files -n %{name}+stock-zlib-devel
%ghost %{crate_instdir}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
# remove bundled zlib and zlib-ng sources
rm -r src/zlib/
rm -r src/zlib-ng/
%cargo_prep
%generate_buildrequires
%cargo_generate_buildrequires
echo 'pkgconfig(zlib)'
%build
%cargo_build
%install
%cargo_install
%if %{with check}
%check
%cargo_test
%endif
%changelog
* Mon Nov 20 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 1.1.12-1
- Rebuilt for MSVSphere 9.2
* Sat Jul 29 2023 Fabio Valentini <decathorpe@gmail.com> - 1.1.12-1
- Update to version 1.1.12; Fixes RHBZ#2224862
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Mon May 01 2023 Fabio Valentini <decathorpe@gmail.com> - 1.1.9-1
- Update to version 1.1.9; Fixes RHBZ#2190481
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon May 30 2022 Fabio Valentini <decathorpe@gmail.com> - 1.1.8-1
- Update to version 1.1.8; Fixes RHBZ#2091230
* Thu May 12 2022 Fabio Valentini <decathorpe@gmail.com> - 1.1.6-1
- Update to version 1.1.6; Fixes RHBZ#2079190
* Thu Mar 31 2022 Fabio Valentini <decathorpe@gmail.com> - 1.1.5-1
- Update to version 1.1.5; Fixes RHBZ#2061218
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Apr 30 2021 Fabio Valentini <decathorpe@gmail.com> - 1.1.3-1
- Update to version 1.1.3.
- Fixes RHBZ#1955368
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Sep 18 2020 Fabio Valentini <decathorpe@gmail.com> - 1.1.2-1
- Update to version 1.1.2.
* Wed Aug 19 2020 Josh Stone <jistone@redhat.com> - 1.1.0-1
- Update to 1.1.0
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.25-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.25-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.25-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jun 20 12:34:11 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.25-5
- Regenerate
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.25-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Dec 20 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.25-3
- Run tests in infrastructure
* Sun Nov 04 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.25-2
- Adapt to new packaging
* Thu Oct 25 2018 Josh Stone <jistone@redhat.com> - 1.0.25-1
- Update to 1.0.25
* Fri Oct 12 2018 Josh Stone <jistone@redhat.com> - 1.0.24-1
- Update to 1.0.24
* Fri Sep 28 2018 Josh Stone <jistone@redhat.com> - 1.0.23-1
- Update to 1.0.23
* Mon Sep 17 2018 Josh Stone <jistone@redhat.com> - 1.0.22-1
- Update to 1.0.22
* Tue Aug 07 2018 Josh Stone <jistone@redhat.com> - 1.0.20-1
- Update to 1.0.20
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.18-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.18-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Mon Jan 08 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.18-3
- Rebuild for rust-packaging v5
* Sun Dec 03 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.18-2
- Remove bundled zlib
* Thu Nov 16 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.18-1
- Update to 1.0.18
* Mon Jun 26 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.16-1
- Update to 1.0.16
* Thu Jun 15 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.14-1
- Update to 1.0.14
* Wed Jun 14 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.13-3
- Port to use rust-packaging
* Sun Feb 26 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.13-2
- Rebuild
* Sun Feb 26 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.13-1
- Initial package
Write Preview
Loading…
Cancel
Save