prepare for stagex bindgen

This commit is contained in:
Ryan Heywood 2024-03-06 19:32:32 -05:00
parent c199843a28
commit ec8a5c893f
Signed by: ryan
GPG Key ID: 8E401478A3FBEF72
6 changed files with 2 additions and 52 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
target target
testing_data testing_data
out

36
Cargo.lock generated
View File

@ -356,27 +356,6 @@ dependencies = [
"serde", "serde",
] ]
[[package]]
name = "bindgen"
version = "0.65.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5"
dependencies = [
"bitflags 1.3.2",
"cexpr",
"clang-sys",
"lazy_static",
"lazycell",
"peeking_take_while",
"prettyplease",
"proc-macro2",
"quote",
"regex",
"rustc-hash",
"shlex",
"syn 2.0.48",
]
[[package]] [[package]]
name = "bindgen" name = "bindgen"
version = "0.68.1" version = "0.68.1"
@ -1680,7 +1659,6 @@ dependencies = [
name = "keyfork" name = "keyfork"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"bindgen 0.68.1",
"card-backend-pcsc", "card-backend-pcsc",
"clap", "clap",
"clap_complete", "clap_complete",
@ -2141,7 +2119,6 @@ dependencies = [
name = "nettle-sys" name = "nettle-sys"
version = "2.3.0" version = "2.3.0"
dependencies = [ dependencies = [
"bindgen 0.65.1",
"cc", "cc",
"libc", "libc",
"pkg-config", "pkg-config",
@ -2593,16 +2570,6 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
[[package]]
name = "prettyplease"
version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5"
dependencies = [
"proc-macro2",
"syn 2.0.48",
]
[[package]] [[package]]
name = "primeorder" name = "primeorder"
version = "0.13.6" version = "0.13.6"
@ -3509,9 +3476,6 @@ dependencies = [
[[package]] [[package]]
name = "v4l2-sys-mit" name = "v4l2-sys-mit"
version = "0.3.0" version = "0.3.0"
dependencies = [
"bindgen 0.68.1",
]
[[package]] [[package]]
name = "valuable" name = "valuable"

View File

@ -54,4 +54,4 @@ RUN --network=none \
--bin keyfork --bin keyfork
FROM scratch AS package FROM scratch AS package
COPY --from=build keyfork/target/release/keyfork /keyfork COPY --from=build /src/target/x86_64-unknown-linux-musl/release/keyfork /keyfork

View File

@ -9,12 +9,8 @@ default = [
"completion", "completion",
"qrcode-decode-backend-rqrr", "qrcode-decode-backend-rqrr",
"sequoia-crypto-backend-nettle", "sequoia-crypto-backend-nettle",
"link-static",
] ]
link-static = ["bindgen/static"]
link-runtime = ["bindgen/runtime"]
completion = ["dep:clap_complete"] completion = ["dep:clap_complete"]
qrcode-decode-backend-rqrr = ["keyfork-qrcode/decode-backend-rqrr"] qrcode-decode-backend-rqrr = ["keyfork-qrcode/decode-backend-rqrr"]
@ -48,6 +44,3 @@ openpgp-card-sequoia = { version = "0.2.0", default-features = false }
openpgp-card = "0.4.1" openpgp-card = "0.4.1"
clap_complete = { version = "4.4.6", optional = true } clap_complete = { version = "4.4.6", optional = true }
sequoia-openpgp = { version = "1.17.0", default-features = false, features = ["compression"] } sequoia-openpgp = { version = "1.17.0", default-features = false, features = ["compression"] }
# necessary for enabling downstream feature flags
bindgen = { version = "0.68.1", default-features = false }

View File

@ -41,10 +41,6 @@ dependencies = [
[dependencies.libc] [dependencies.libc]
version = "0.2" version = "0.2"
[build-dependencies.bindgen]
version = ">= 0.58.0, < 0.69.0"
default-features = false
[build-dependencies.cc] [build-dependencies.cc]
version = "1" version = "1"

View File

@ -17,7 +17,3 @@ authors = ["Christopher N. Hesse <raymanfx@gmail.com>"]
build = "build.rs" build = "build.rs"
description = "Raw v4l2 bindings (MIT licensed)" description = "Raw v4l2 bindings (MIT licensed)"
license = "MIT" license = "MIT"
[build-dependencies.bindgen]
version = "0.68.1"
default-features = false