pijul: remove unnecessary bindgen workarounds

This commit is contained in:
classabbyamp 2022-03-13 20:54:55 -04:00 committed by Leah Neukirchen
parent e8c4c0e5c0
commit 241b17eb22
2 changed files with 3 additions and 9 deletions

View file

@ -1,10 +1,9 @@
--- a/Cargo.toml --- a/Cargo.toml
+++ b/Cargo.toml +++ b/Cargo.toml
@@ -133,3 +133,7 @@ @@ -133,3 +133,6 @@
version = "2.0" version = "2.0"
[target."cfg(unix)".dependencies.tokio-uds] [target."cfg(unix)".dependencies.tokio-uds]
version = "0.2" version = "0.2"
+ +
+[patch.crates-io] +[patch.crates-io]
+"bindgen" = {git = 'https://github.com/Duncaen/rust-bindgen', rev = "e70d9568887ffb6c2a7d7d165a71aed311a29129"}
+"sequoia-rfc2822" = {path = '/builddir/sequoia-v0.9.0/rfc2822'} +"sequoia-rfc2822" = {path = '/builddir/sequoia-v0.9.0/rfc2822'}

View file

@ -1,8 +1,9 @@
# Template file for 'pijul' # Template file for 'pijul'
pkgname=pijul pkgname=pijul
version=0.12.2 version=0.12.2
revision=4 revision=5
build_style=cargo build_style=cargo
build_helper=rust
_sequoia_ver=0.9.0 _sequoia_ver=0.9.0
hostmakedepends="pkg-config clang" hostmakedepends="pkg-config clang"
makedepends="libsodium-devel openssl-devel nettle-devel" makedepends="libsodium-devel openssl-devel nettle-devel"
@ -15,12 +16,6 @@ distfiles="https://crates.io/api/v1/crates/pijul/${version}/download>pijul-${ver
checksum="f92a3f4063e780ca45c161ceb0f42baf34dfeddf3359ebf6c2e0442d9abb5889 checksum="f92a3f4063e780ca45c161ceb0f42baf34dfeddf3359ebf6c2e0442d9abb5889
71823c88b9666611f3cfa6b1d923bd66fda92fa6a53368b195bd2f962fdf7f4b" 71823c88b9666611f3cfa6b1d923bd66fda92fa6a53368b195bd2f962fdf7f4b"
if [ "$CROSS_BUILD" ]; then
export HOST_CC="$BUILD_CC"
export HOST_CFLAGS="$BUILD_CFLAGS"
export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=$XBPS_CROSS_BASE"
fi
# We only want to install the binary, so don't run cargo install # We only want to install the binary, so don't run cargo install
do_install() { do_install() {
vbin target/${RUST_TARGET}/release/pijul vbin target/${RUST_TARGET}/release/pijul