From e5a36f6936daa3d03759d834104a1ba2351fb514 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 10:20:45 +1000
Subject: [PATCH] Make libffi version more flexible (#7734) (#7738)
* Make libffi version more flexible
Can not install on debian 12
Fixes #6036
* target v11 packaging on v12 install
we are only targeting one version per debian / ubuntu channel. This should not present a problem
(cherry picked from commit 4edea65e003b67539246eeecfe1629ba3cfe301c)
Co-authored-by: Matthias Mair <code@mjmair.com>
---
.pkgr.yml | 2 +-
contrib/install.sh | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/.pkgr.yml b/.pkgr.yml
index 88f27034a5..1a4241c6d5 100644
--- a/.pkgr.yml
+++ b/.pkgr.yml
@@ -32,7 +32,7 @@ dependencies:
- gettext
- nginx
- jq
- - libffi7
+ - "libffi7 | libffi8"
targets:
ubuntu-20.04: true
debian-11: true
diff --git a/contrib/install.sh b/contrib/install.sh
index 3b432ae366..fc6b005960 100755
--- a/contrib/install.sh
+++ b/contrib/install.sh
@@ -75,6 +75,7 @@ root_command() {
;;
"Debian GNU/Linux" | "debian gnu/linux" | Raspbian)
if [[ $VER == "12" ]]; then
+ DIST_VER="11"
SUPPORTED=true
elif [[ $VER == "11" ]]; then
SUPPORTED=true