Skip to content

Commit

Permalink
Dont use shared libffi and libreadline on linux builds
Browse files Browse the repository at this point in the history
Signed-off-by: falkTX <falktx@falktx.com>
  • Loading branch information
falkTX committed Dec 8, 2023
1 parent c9c4da1 commit a94296b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/bootstrap-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ case "${1}" in
;;
*)
apt-get update -qq
apt-get install -yqq autoconf automake build-essential curl cmake dpkg-dev file git jq libffi-dev libglib2.0-dev-bin libreadline-dev libtool lsb-release make meson gperf patchelf uuid-dev zlib1g-dev
apt-get install -yqq autoconf automake build-essential curl cmake dpkg-dev file git jq libglib2.0-dev-bin libtool lsb-release make meson gperf patchelf uuid-dev zlib1g-dev

linux_arch=$(get_linux_deb_arch "${1}")
release=$(lsb_release -cs 2>/dev/null)
Expand Down Expand Up @@ -111,7 +111,7 @@ case "${1}" in
elif [ "${1}" = "win32" ] || [ "${1}" = "win64" ]; then
dpkg --add-architecture i386
apt-get update -qq
apt-get install -yqq autopoint mingw-w64
apt-get install -yqq autopoint libffi-dev libreadline-dev mingw-w64
if [ "$(lsb_release -si 2>/dev/null)" = "Debian" ]; then
apt-get install -yqq wine wine32 wine64
else
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bootstrap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:

env:
CACHE_VERSION: 3
CACHE_VERSION: 4
DEBIAN_FRONTEND: noninteractive
PAWPAW_SKIP_TESTS: 1

Expand Down
2 changes: 1 addition & 1 deletion bootstrap-plugins.sh
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ fi
# ---------------------------------------------------------------------------------------------------------------------
# libffi

if [ "${WIN32}" -eq 1 ]; then
if [ "${LINUX}" -eq 1 ] || [ "${WIN32}" -eq 1 ]; then
LIBFFI_EXTRAFLAGS="--disable-multi-os-directory --disable-raw-api"

download libffi "${LIBFFI_VERSION}" "${LIBFFI_URL}"
Expand Down

0 comments on commit a94296b

Please sign in to comment.