From 3eb940aebee89ce54f4d9d9bcf43a02df7de75e2 Mon Sep 17 00:00:00 2001 From: Ben Selwyn-Smith Date: Thu, 27 Mar 2025 09:19:32 +1000 Subject: [PATCH 1/2] Revert "build: install libffi7 manually (#964)" This reverts commit 04dbdc74c08021666fe18d77fa7599964311faf5. --- Makefile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 1b97d02fc..7842a6e94 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2022 - 2025, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2022 - 2024, 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: @@ -145,8 +145,6 @@ 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 the Ubuntu operating system. .PHONY: souffle souffle: if ! command -v souffle; then \ @@ -160,9 +158,6 @@ 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; \ - rm libffi7_3.3-4_amd64.deb; \ sudo apt install souffle;; \ "Darwin") \ if command -v brew; then \ From d71ed8282e9b8f9d927db731a4eb5f44610b6110 Mon Sep 17 00:00:00 2001 From: Ben Selwyn-Smith Date: Thu, 27 Mar 2025 14:13:33 +1000 Subject: [PATCH 2/2] chore: use Souffle 2.5; manually install Souffle for Ubuntu Signed-off-by: Ben Selwyn-Smith --- Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 7842a6e94..ae5b648d1 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: @@ -151,13 +151,16 @@ souffle: echo "Installing system dependency: souffle" && \ case $(OS_DISTRO) in \ "Oracle Linux") \ - sudo dnf -y install https://github.com/souffle-lang/souffle/releases/download/2.4/x86_64-oraclelinux-8-souffle-2.4-Linux.rpm;; \ + sudo dnf -y install https://github.com/souffle-lang/souffle/releases/download/2.5/x86_64-oraclelinux-9-souffle-2.5-Linux.rpm;; \ "Fedora Linux") \ - sudo dnf -y install https://github.com/souffle-lang/souffle/releases/download/2.4/x86_64-fedora-34-souffle-2.4-Linux.rpm;; \ + sudo dnf -y install https://github.com/souffle-lang/souffle/releases/download/2.5/x86_64-fedora-41-souffle-2.5-Linux.rpm;; \ "Ubuntu") \ 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 https://github.com/souffle-lang/souffle/releases/download/2.5/x86_64-ubuntu-2404-souffle-2.5-Linux.deb; \ + sudo apt install ./x86_64-ubuntu-2404-souffle-2.5-Linux.deb; \ + rm x86_64-ubuntu-2404-souffle-2.5-Linux.deb; \ sudo apt install souffle;; \ "Darwin") \ if command -v brew; then \