Caleb Maclennan pushed to branch main at Arch Linux / Packaging / Packages / cargo-edit
Commits: 1d552d8e by Caleb Maclennan at 2024-05-03T14:02:43+03:00 upgpkg: 0.12.2-2: Move .so deps where they won't find the wrong architecture - - - - - 2 changed files: - + .SRCINFO - PKGBUILD Changes: ===================================== .SRCINFO ===================================== @@ -0,0 +1,22 @@ +pkgbase = cargo-edit + pkgdesc = Managing cargo dependencies from the command line + pkgver = 0.12.2 + pkgrel = 2 + url = https://github.com/killercup/cargo-edit/releases + arch = x86_64 + license = MIT + license = Apache-2.0 + depends = cargo + depends = libgit2 + depends = libssh2 + depends = openssl + source = https://github.com/killercup/cargo-edit/archive/v0.12.2/cargo-edit-0.12.2.tar.gz + sha512sums = 91750b1129eebbbc86d9eb1e3e3ed428039b4997975a7708acee60cd537b5daa4a1de0ed64462162fa82b73a15795c1e1603aaac2f7bcc1570ec83c147f0c207 + b2sums = 37e91b5eb41fd56e2be382ee77bd6a6c859d1e1d7c99d45c2597e1a24194ea79ad1c563eb065615bf9cd87ab108de84d772e31d4faeaa57f9f556d6eb7fe570b + +pkgname = cargo-edit + depends = cargo + depends = libgit2 + depends = libssh2 + depends = openssl + depends = libgit2.so ===================================== PKGBUILD ===================================== @@ -4,12 +4,12 @@ pkgname=cargo-edit pkgver=0.12.2 -pkgrel=1 +pkgrel=2 pkgdesc='Managing cargo dependencies from the command line' url='https://github.com/killercup/cargo-edit/releases' arch=('x86_64') -license=('MIT' 'APACHE') -depends=('cargo' 'libgit2.so' 'libssh2' 'openssl') +license=('MIT' 'Apache-2.0') +depends=('cargo' 'libgit2' 'libssh2' 'openssl') source=(https://github.com/killercup/${pkgname}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz) sha512sums=('91750b1129eebbbc86d9eb1e3e3ed428039b4997975a7708acee60cd537b5daa4a1de0ed64462162fa82b73a15795c1e1603aaac2f7bcc1570ec83c147f0c207') b2sums=('37e91b5eb41fd56e2be382ee77bd6a6c859d1e1d7c99d45c2597e1a24194ea79ad1c563eb065615bf9cd87ab108de84d772e31d4faeaa57f9f556d6eb7fe570b') @@ -17,22 +17,32 @@ b2sums=('37e91b5eb41fd56e2be382ee77bd6a6c859d1e1d7c99d45c2597e1a24194ea79ad1c563 prepare() { cd "${pkgname}-${pkgver}" sed -i '/\"vendored-libgit2\"/d' Cargo.toml - cargo fetch --locked --target "$CARCH-unknown-linux-gnu" + cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')" } build() { cd ${pkgname}-${pkgver} CFLAGS+=' -ffat-lto-objects' - LIBSSH2_SYS_USE_PKG_CONFIG=1 cargo build --frozen --release + LIBSSH2_SYS_USE_PKG_CONFIG=1 cargo build --frozen --release } check() { cd ${pkgname}-${pkgver} + # Note: Rust 1.78 started warning for deprecated config file names, something + # being used extensively in tests, build with older rust from the package + # archive if you want to run checks, e.g.: + # `pkgctl build -I rust-1:1.77.2-2-x86_64.pkg.tar.zst` + local skipped=( + # Rust changed some error messages + 'invalid_manifest::case' + 'invalid_workspace_root_manifest::case' + ) # tests depend on target/debug/ - LIBSSH2_SYS_USE_PKG_CONFIG=1 cargo test --frozen + LIBSSH2_SYS_USE_PKG_CONFIG=1 cargo test --frozen -- ${skipped[@]/#/--skip } } package() { + depends+=(libgit2.so) cd ${pkgname}-${pkgver} install -Dm 755 \ target/release/cargo-upgrade \ View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/cargo-edit/-/commit/1d552d8e7eb668b5927fbebdb24fd9eea40556a1 -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/cargo-edit/-/commit/1d552d8e7eb668b5927fbebdb24fd9eea40556a1 You're receiving this email because of your account on gitlab.archlinux.org.
