From 357bf864a3b20d9bda2b539f2a03ab41b71f6b28 Mon Sep 17 00:00:00 2001 From: Emendir Date: Fri, 28 Nov 2025 18:47:17 +0100 Subject: [PATCH] moved os_prereqs --- packaging/{share => }/os_prereqs/install_prereqs.sh | 0 packaging/{share => }/os_prereqs/linux.sh | 0 packaging/{share => }/os_prereqs/linux_packages/kivy.sh | 0 packaging/{share => }/os_prereqs/linux_packages/liboqs.sh | 2 +- packaging/{share => }/os_prereqs/macos.sh | 0 packaging/{share => }/os_prereqs/os_package_utils.sh | 2 +- packaging/{share => }/os_prereqs/windows.sh | 0 packaging/{share => }/os_prereqs/windows_packages/5_liboqs.sh | 0 8 files changed, 2 insertions(+), 2 deletions(-) rename packaging/{share => }/os_prereqs/install_prereqs.sh (100%) rename packaging/{share => }/os_prereqs/linux.sh (100%) rename packaging/{share => }/os_prereqs/linux_packages/kivy.sh (100%) rename packaging/{share => }/os_prereqs/linux_packages/liboqs.sh (94%) rename packaging/{share => }/os_prereqs/macos.sh (100%) rename packaging/{share => }/os_prereqs/os_package_utils.sh (97%) rename packaging/{share => }/os_prereqs/windows.sh (100%) rename packaging/{share => }/os_prereqs/windows_packages/5_liboqs.sh (100%) diff --git a/packaging/share/os_prereqs/install_prereqs.sh b/packaging/os_prereqs/install_prereqs.sh similarity index 100% rename from packaging/share/os_prereqs/install_prereqs.sh rename to packaging/os_prereqs/install_prereqs.sh diff --git a/packaging/share/os_prereqs/linux.sh b/packaging/os_prereqs/linux.sh similarity index 100% rename from packaging/share/os_prereqs/linux.sh rename to packaging/os_prereqs/linux.sh diff --git a/packaging/share/os_prereqs/linux_packages/kivy.sh b/packaging/os_prereqs/linux_packages/kivy.sh similarity index 100% rename from packaging/share/os_prereqs/linux_packages/kivy.sh rename to packaging/os_prereqs/linux_packages/kivy.sh diff --git a/packaging/share/os_prereqs/linux_packages/liboqs.sh b/packaging/os_prereqs/linux_packages/liboqs.sh similarity index 94% rename from packaging/share/os_prereqs/linux_packages/liboqs.sh rename to packaging/os_prereqs/linux_packages/liboqs.sh index a476639..087f3d1 100755 --- a/packaging/share/os_prereqs/linux_packages/liboqs.sh +++ b/packaging/os_prereqs/linux_packages/liboqs.sh @@ -7,7 +7,7 @@ set -euo pipefail # Exit if any command/script fails LIBOQS_REPO="https://github.com/open-quantum-safe/liboqs.git" LIBOQS_TAG="0.14.0" # adjust if needed LIBOQS_INSTALL_PREFIX="/usr/local/lib/" -export LD_LIBRARY_PATH="/usr/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" +export LD_LIBRARY_PATH="/usr/local/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" # Number of parallel build jobs NPROC=$(( $(nproc) - 1 )) diff --git a/packaging/share/os_prereqs/macos.sh b/packaging/os_prereqs/macos.sh similarity index 100% rename from packaging/share/os_prereqs/macos.sh rename to packaging/os_prereqs/macos.sh diff --git a/packaging/share/os_prereqs/os_package_utils.sh b/packaging/os_prereqs/os_package_utils.sh similarity index 97% rename from packaging/share/os_prereqs/os_package_utils.sh rename to packaging/os_prereqs/os_package_utils.sh index d2f3bf5..bd269bf 100755 --- a/packaging/share/os_prereqs/os_package_utils.sh +++ b/packaging/os_prereqs/os_package_utils.sh @@ -3,7 +3,7 @@ # the absolute path of this script's directory _SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 ; pwd -P )" -PROJ_DIR="$( cd -- "${_SCRIPT_DIR}/../../../" >/dev/null 2>&1 ; pwd -P )" +PROJ_DIR="$( cd -- "${_SCRIPT_DIR}/../../" >/dev/null 2>&1 ; pwd -P )" check_commands() { diff --git a/packaging/share/os_prereqs/windows.sh b/packaging/os_prereqs/windows.sh similarity index 100% rename from packaging/share/os_prereqs/windows.sh rename to packaging/os_prereqs/windows.sh diff --git a/packaging/share/os_prereqs/windows_packages/5_liboqs.sh b/packaging/os_prereqs/windows_packages/5_liboqs.sh similarity index 100% rename from packaging/share/os_prereqs/windows_packages/5_liboqs.sh rename to packaging/os_prereqs/windows_packages/5_liboqs.sh