Browse Source

Dont use shared libffi and libreadline on linux builds

Signed-off-by: falkTX <falktx@falktx.com>
pull/28/head
falkTX 1 year ago
parent
commit
a94296bcc2
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 4 additions and 4 deletions
  1. +2
    -2
      .github/workflows/bootstrap-deps.sh
  2. +1
    -1
      .github/workflows/bootstrap.yml
  3. +1
    -1
      bootstrap-plugins.sh

+ 2
- 2
.github/workflows/bootstrap-deps.sh View File

@@ -71,7 +71,7 @@ case "${1}" in
;; ;;
*) *)
apt-get update -qq 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}") linux_arch=$(get_linux_deb_arch "${1}")
release=$(lsb_release -cs 2>/dev/null) release=$(lsb_release -cs 2>/dev/null)
@@ -111,7 +111,7 @@ case "${1}" in
elif [ "${1}" = "win32" ] || [ "${1}" = "win64" ]; then elif [ "${1}" = "win32" ] || [ "${1}" = "win64" ]; then
dpkg --add-architecture i386 dpkg --add-architecture i386
apt-get update -qq 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 if [ "$(lsb_release -si 2>/dev/null)" = "Debian" ]; then
apt-get install -yqq wine wine32 wine64 apt-get install -yqq wine wine32 wine64
else else


+ 1
- 1
.github/workflows/bootstrap.yml View File

@@ -4,7 +4,7 @@ on:
push: push:


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




+ 1
- 1
bootstrap-plugins.sh View File

@@ -357,7 +357,7 @@ fi
# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------
# libffi # libffi


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


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


Loading…
Cancel
Save