Caleb Maclennan pushed to branch main at Arch Linux / Packaging / Packages / 
git-absorb


Commits:
b411f186 by Caleb Maclennan at 2025-01-22T20:44:26+03:00
upgpkg: 0.6.17-3: Make sure future vendoring of libgit2 will fail, closes #1

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,11 +1,13 @@
 pkgbase = git-absorb
        pkgdesc = git commit --fixup, but automatic
        pkgver = 0.6.17
-       pkgrel = 2
+       pkgrel = 3
        url = https://github.com/tummychow/git-absorb
        arch = x86_64
        license = BSD
        makedepends = cargo
+       depends = gcc-libs
+       depends = glibc
        depends = libgit2
        source = 
git-absorb-0.6.17.tar.gz::https://github.com/tummychow/git-absorb/archive/0.6.17.tar.gz
        sha256sums = 
512ef2bf0e642f8c34eb56aad657413bd9e04595e3bc4650ecf1c0799f148ca4


=====================================
PKGBUILD
=====================================
@@ -4,12 +4,12 @@
 
 pkgname=git-absorb
 pkgver=0.6.17
-pkgrel=2
+pkgrel=3
 pkgdesc="git commit --fixup, but automatic"
 arch=('x86_64')
 url="https://github.com/tummychow/git-absorb";
 license=('BSD')
-depends=('libgit2')
+depends=('gcc-libs' 'glibc' 'libgit2')
 makedepends=('cargo')
 
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/tummychow/git-absorb/archive/${pkgver}.tar.gz";)
 sha256sums=('512ef2bf0e642f8c34eb56aad657413bd9e04595e3bc4650ecf1c0799f148ca4')
@@ -22,8 +22,10 @@ prepare() {
 
 build() {
   cd "${pkgname}-${pkgver}"
-  CFLAGS+=" -ffat-lto-objects"
-  LIBGIT2_SYS_USE_PKG_CONFIG=1 cargo build --release --frozen
+  CFLAGS+=' -ffat-lto-objects'
+  depends+=('libgit2.so')
+  export LIBGIT2_NO_VENDOR=1
+  cargo build --release --frozen
   "target/release/$pkgname" --gen-completions bash > 
"completions/$pkgname.bash"
   "target/release/$pkgname" --gen-completions fish > 
"completions/$pkgname.fish"
   "target/release/$pkgname" --gen-completions zsh > "completions/_$pkgname"
@@ -31,7 +33,8 @@ build() {
 
 check() {
   cd "${pkgname}-${pkgver}"
-  LIBGIT2_SYS_USE_PKG_CONFIG=1 cargo test --frozen
+  export LIBGIT2_NO_VENDOR=1
+  cargo test --frozen
 }
 
 package() {



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/git-absorb/-/commit/b411f1869a04020bd4b4a63f1b7db9d7ffe10482

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/git-absorb/-/commit/b411f1869a04020bd4b4a63f1b7db9d7ffe10482
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to