Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support cc as an optional alternative to cmake #174

Merged
merged 33 commits into from
May 16, 2024
Merged
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
0aadb3e
Checkpoint
Jake-Shadle Jan 17, 2024
02042e0
Switch to cc in Cargo-zng.toml
Jake-Shadle Jan 17, 2024
ca67f9f
What
Jake-Shadle Jan 17, 2024
0e7025b
Fix version read
Jake-Shadle Jan 17, 2024
d2709ad
Fix compilation in non-compat
Jake-Shadle Jan 17, 2024
84e9eb7
Oops
Jake-Shadle Jan 17, 2024
08380a4
Target features may not be present in some cases
Jake-Shadle Jan 17, 2024
9bbe8be
Sigh
Jake-Shadle Jan 17, 2024
892409b
Fix windows
Jake-Shadle Jan 17, 2024
1176816
More fixes
Jake-Shadle Jan 17, 2024
1d0f949
Fix off_t
Jake-Shadle Jan 17, 2024
d82ff40
Fix harder
Jake-Shadle Jan 17, 2024
36284c9
Why
Jake-Shadle Jan 17, 2024
6afbe08
Fix zconf
Jake-Shadle Jan 17, 2024
78abd4e
Minor cleanup
Jake-Shadle Jan 17, 2024
47a44ef
Address feedback
Jake-Shadle Jan 17, 2024
6bae6f8
Further cleanup
Jake-Shadle Jan 17, 2024
70cb64a
Add zlib-ng-no-cmake feature
Jake-Shadle Jan 31, 2024
c5d869f
Fix arm
Jake-Shadle Jan 31, 2024
6fdef27
Print compiler version if compilation fails
Jake-Shadle Jan 31, 2024
032c708
Oops
Jake-Shadle Jan 31, 2024
fe92fcb
Don't build i686/x86_64 linux-gnu on CI
Jake-Shadle Jan 31, 2024
8b4d3be
Don't set ARM_NEON_HASLD4
Jake-Shadle Jan 31, 2024
6e62175
Fix arm
Jake-Shadle Jan 31, 2024
b2d285a
Skip more old/broken targets
Jake-Shadle Jan 31, 2024
0f188f3
Mabye this isn't set inside container?
Jake-Shadle Jan 31, 2024
0f599ad
Use log groups in CI
Jake-Shadle Jan 31, 2024
79c4d4c
Add s390x support, flesh out powerpc/risv todo
Jake-Shadle Feb 1, 2024
66a0e1d
Rename feature
Jake-Shadle Feb 1, 2024
23d3369
Add CI job
Jake-Shadle Feb 1, 2024
cb5b895
Skip s390x as well, compiler is too old
Jake-Shadle Feb 1, 2024
4d68d13
Print warning to github actions if cc test/systest run fail
Jake-Shadle Feb 3, 2024
3fbea9f
Address feedback
Jake-Shadle Feb 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Checkpoint
  • Loading branch information
Jake-Shadle committed May 13, 2024
commit 0aadb3e1ed029e95703d10eef480bccf3b0f0db2
8 changes: 5 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -34,7 +34,6 @@ libc = { version = "0.2.43", optional = true }
[build-dependencies]
pkg-config = "0.3.9"
cc = "1.0.18"
cmake = { version = "0.1.44", optional = true }
vcpkg = "0.2"

[features]
@@ -56,9 +55,12 @@ default = ["libc", "stock-zlib"]
#
# This allows higher-level crates depending on your library to opt into zlib-ng
# if desired.
zlib-ng = ["libc"]
# AVX-512 is nightly-only currently <https://github.com/rust-lang/rust/issues/44839>,
# enabling this feature means that AVX-512 support is probed for in the C compiler.
#
# Building zlib-ng requires cmake.
zlib-ng = ["libc", "cmake"]
# No effect on non-x86 arches
zlib-ng-avx512 = ["zlib-ng"]
stock-zlib = []
# Deprecated: the assembly routines are outdated, and either reduce performance
# or cause segfaults.
10 changes: 4 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -43,8 +43,6 @@ libz-sys = { version = "1.1", default-features = false, features = ["libc"] }
This allows higher-level crates depending on your library to opt into zlib-ng
if desired.

Building zlib-ng requires `cmake`.

Crates that don't require compatibility with the zlib C API, and use zlib
exclusively from Rust or support the zlib-ng native C API (prefixed with
`zng_`) can use [`libz-ng-sys`](https://crates.io/crates/libz-ng-sys) instead,
@@ -62,10 +60,10 @@ but we don't guarantee these will continue to work.

This project is licensed under either of

* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
https://www.apache.org/licenses/LICENSE-2.0)
* MIT license ([LICENSE-MIT](LICENSE-MIT) or
https://opensource.org/license/mit/)
* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
<https://www.apache.org/licenses/LICENSE-2.0>)
* MIT license ([LICENSE-MIT](LICENSE-MIT) or
<https://opensource.org/license/mit/>)

at your option.

Loading
Oops, something went wrong.