From 233f67054ff85cf3fd1b7595451682bad96ab842 Mon Sep 17 00:00:00 2001
From: omni <omni+alpine@hack.org>
Date: Wed, 27 Nov 2024 20:45:04 +0000
Subject: [PATCH] community/*: add HARECACHE env var to hare aports
to make sure no old cache is used during build, like what we do for
golang aports
---
community/bonsai/APKBUILD | 8 +++-----
community/hare-ssh/APKBUILD | 4 +++-
community/himitsu-ssh/APKBUILD | 4 +++-
community/himitsu/APKBUILD | 4 +++-
community/sxmobar/APKBUILD | 8 +++-----
5 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/community/bonsai/APKBUILD b/community/bonsai/APKBUILD
index d7888580b380..3b260cd9fcc1 100644
--- a/community/bonsai/APKBUILD
+++ b/community/bonsai/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Willow Barraco <contact@willowbarraco.fr>
pkgname=bonsai
pkgver=1.2.0
-pkgrel=0
+pkgrel=1
pkgdesc="A Finite State Machine structured as a tree that trigger commands"
url="https://sr.ht/~stacyharper/bonsai/"
arch="x86_64 aarch64 riscv64" # hare
@@ -10,11 +10,9 @@ makedepends="hare hare-json hare-ev"
source="$pkgname-v$pkgver.tar.gz::https://git.sr.ht/~stacyharper/bonsai/archive/v$pkgver.tar.gz"
builddir="$srcdir/$pkgname-v$pkgver"
-build() {
- # Don't use user's global Hare cache
- export XDG_CACHE_HOME="$srcdir"/hare-cache
- mkdir -p "$XDG_CACHE_HOME"
+export HARECACHE="${HARECACHE:-"$srcdir/hare-cache"}"
+build() {
make -j1
}
diff --git a/community/hare-ssh/APKBUILD b/community/hare-ssh/APKBUILD
index b323fdc16d13..864adc581f79 100644
--- a/community/hare-ssh/APKBUILD
+++ b/community/hare-ssh/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Simon Zeni <simon@bl4ckb0ne.ca>
pkgname=hare-ssh
pkgver=0.24.2
-pkgrel=0
+pkgrel=1
pkgdesc="SSH support for Hare"
url="https://sr.ht/~sircmpwn/hare-ssh"
arch="noarch !armhf !armv7 !ppc64le !s390x !x86 !loongarch64" #hare
@@ -11,6 +11,8 @@ source="
$pkgname-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/hare-ssh/archive/$pkgver.tar.gz
"
+export HARECACHE="${HARECACHE:-"$srcdir/hare-cache"}"
+
build() {
make -j1 PREFIX=/usr
}
diff --git a/community/himitsu-ssh/APKBUILD b/community/himitsu-ssh/APKBUILD
index 80e5533daf4d..84279a67ed4f 100644
--- a/community/himitsu-ssh/APKBUILD
+++ b/community/himitsu-ssh/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer:
pkgname=himitsu-ssh
pkgver=0.4
-pkgrel=0
+pkgrel=1
pkgdesc="SSH integration for Himitsu"
url="https://himitsustore.org"
arch="x86_64 aarch64 riscv64" # Hare
@@ -15,6 +15,8 @@ source="
$pkgname-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/himitsu-ssh/archive/$pkgver.tar.gz
"
+export HARECACHE="${HARECACHE:-"$srcdir/hare-cache"}"
+
build() {
make -j1 PREFIX=/usr
}
diff --git a/community/himitsu/APKBUILD b/community/himitsu/APKBUILD
index 8a3765f0f45d..89e7112478fb 100644
--- a/community/himitsu/APKBUILD
+++ b/community/himitsu/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Patrycja Rosa <alpine@ptrcnull.me>
pkgname=himitsu
pkgver=0.8
-pkgrel=0
+pkgrel=1
pkgdesc="A secret storage manager"
url="https://himitsustore.org"
arch="x86_64 aarch64 riscv64" # Hare
@@ -11,6 +11,8 @@ makedepends="hare scdoc"
subpackages="$pkgname-doc $pkgname-dev"
source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/himitsu/archive/$pkgver.tar.gz"
+export HARECACHE="${HARECACHE:-"$srcdir/hare-cache"}"
+
build() {
make -j1 PREFIX=/usr
}
diff --git a/community/sxmobar/APKBUILD b/community/sxmobar/APKBUILD
index e53607e8ebcb..6d4288e23642 100644
--- a/community/sxmobar/APKBUILD
+++ b/community/sxmobar/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Willow Barraco <contact@willowbarraco.fr>
pkgname=sxmobar
pkgver=1.1.0
-pkgrel=0
+pkgrel=1
pkgdesc="A status bar component manager"
url="https://git.sr.ht/~stacyharper/sxmobar/"
arch="x86_64 aarch64 riscv64" # hare
@@ -11,11 +11,9 @@ subpackages="$pkgname-doc"
source="$pkgname-v$pkgver.tar.gz::https://git.sr.ht/~stacyharper/sxmobar/archive/v$pkgver.tar.gz"
builddir="$srcdir/$pkgname-v$pkgver"
-build() {
- # Don't use user's global Hare cache
- export XDG_CACHE_HOME="$srcdir"/hare-cache
- mkdir -p "$XDG_CACHE_HOME"
+export HARECACHE="${HARECACHE:-"$srcdir/hare-cache"}"
+build() {
make -j1
}
--
GitLab