From 37e83568f435dd29e8816f89eb355aaa2e9450a7 Mon Sep 17 00:00:00 2001 From: Ben Selwyn-Smith Date: Fri, 17 Jan 2025 14:15:22 +1000 Subject: [PATCH 1/4] fix: manually install libffi7 Signed-off-by: Ben Selwyn-Smith --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7842a6e94..d677d7de6 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2022 - 2024, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2022 - 2025, Oracle and/or its affiliates. All rights reserved. # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/. # Use bash as the shell when executing a rule's recipe. For more details: @@ -158,6 +158,8 @@ souffle: sudo wget https://souffle-lang.github.io/ppa/souffle-key.public -O /usr/share/keyrings/souffle-archive-keyring.gpg; \ echo "deb [signed-by=/usr/share/keyrings/souffle-archive-keyring.gpg] https://souffle-lang.github.io/ppa/ubuntu/ stable main" | sudo tee /etc/apt/sources.list.d/souffle.list; \ sudo apt update; \ + sudo wget http://archive.ubuntu.com/ubuntu/pool/main/libf/libffi/libffi7_3.3-4_amd64.deb; \ + sudo dpkg -i libffi7_3.3-4_amd64.deb; \ sudo apt install souffle;; \ "Darwin") \ if command -v brew; then \ From a6c386a8ff8e2683228d63529239ca4948cef927 Mon Sep 17 00:00:00 2001 From: Ben Selwyn-Smith Date: Fri, 17 Jan 2025 15:10:07 +1000 Subject: [PATCH 2/4] chore: perform cleanup Signed-off-by: Ben Selwyn-Smith --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index d677d7de6..2314a8e46 100644 --- a/Makefile +++ b/Makefile @@ -160,6 +160,7 @@ souffle: sudo apt update; \ sudo wget http://archive.ubuntu.com/ubuntu/pool/main/libf/libffi/libffi7_3.3-4_amd64.deb; \ sudo dpkg -i libffi7_3.3-4_amd64.deb; \ + rm libffi7_3.3-4_amd64.deb; \ sudo apt install souffle;; \ "Darwin") \ if command -v brew; then \ From fbb7c7e99d2d4870031827d2a3fa559e24a77d4b Mon Sep 17 00:00:00 2001 From: Ben Selwyn-Smith Date: Tue, 21 Jan 2025 10:43:08 +1000 Subject: [PATCH 3/4] chore: add comment about missing library Signed-off-by: Ben Selwyn-Smith --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 2314a8e46..226d6094c 100644 --- a/Makefile +++ b/Makefile @@ -145,6 +145,8 @@ else endif # If Souffle cannot be installed, we advise the user to install it manually # and return status code 0, which is not considered a failure. +# Souffle depends upon the libffiX library, where X is the current version it requires. Depending on the version of Ubuntu being used, the exact library +# may not be present. In this script, we manually download and install version 7 on Ubuntu 24.04. .PHONY: souffle souffle: if ! command -v souffle; then \ From 63ed420cc6e1bb2152949b15adc5752e1f83c870 Mon Sep 17 00:00:00 2001 From: Ben Selwyn-Smith Date: Tue, 21 Jan 2025 12:10:05 +1000 Subject: [PATCH 4/4] chore: clarify comment Signed-off-by: Ben Selwyn-Smith --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 226d6094c..1b97d02fc 100644 --- a/Makefile +++ b/Makefile @@ -146,7 +146,7 @@ endif # If Souffle cannot be installed, we advise the user to install it manually # and return status code 0, which is not considered a failure. # Souffle depends upon the libffiX library, where X is the current version it requires. Depending on the version of Ubuntu being used, the exact library -# may not be present. In this script, we manually download and install version 7 on Ubuntu 24.04. +# may not be present. In this script, we manually download and install version 7 on the Ubuntu operating system. .PHONY: souffle souffle: if ! command -v souffle; then \