diff --git a/steps-guix/guile-2.2.4/pass1.sh b/steps-guix/guile-2.2.4/pass1.sh index fcd89f3d..e6ec88b2 100644 --- a/steps-guix/guile-2.2.4/pass1.sh +++ b/steps-guix/guile-2.2.4/pass1.sh @@ -7,6 +7,17 @@ src_prepare() { } src_configure() { + local pkg_config_path libffi_cflags libffi_libs + pkg_config_path="${LIBDIR}/pkgconfig:${PREFIX}/lib/pkgconfig" + libffi_cflags="$(PKG_CONFIG_LIBDIR="${pkg_config_path}" PKG_CONFIG_PATH="${pkg_config_path}" \ + pkg-config --cflags libffi)" + libffi_libs="$(PKG_CONFIG_LIBDIR="${pkg_config_path}" PKG_CONFIG_PATH="${pkg_config_path}" \ + pkg-config --static --libs libffi)" + + PKG_CONFIG_LIBDIR="${pkg_config_path}" \ + PKG_CONFIG_PATH="${pkg_config_path}" \ + LIBFFI_CFLAGS="${libffi_cflags}" \ + LIBFFI_LIBS="${libffi_libs}" \ ./configure \ --prefix="${SEED_PREFIX}" \ --disable-shared \ diff --git a/steps-guix/libffi-3.5.2/pass1.sh b/steps-guix/libffi-3.5.2/pass1.sh new file mode 100755 index 00000000..55fafad7 --- /dev/null +++ b/steps-guix/libffi-3.5.2/pass1.sh @@ -0,0 +1,19 @@ +# SPDX-FileCopyrightText: 2022 Andrius Štikonas +# +# SPDX-License-Identifier: GPL-3.0-or-later + +src_prepare() { + rm doc/libffi.{pdf,info} + + autoreconf-2.71 -fi +} + +src_configure() { + ./configure \ + --prefix="${PREFIX}" \ + --libdir="${LIBDIR}" \ + --build="${TARGET}" \ + --disable-shared \ + --with-gcc-arch=generic \ + --enable-pax_emutramp +} diff --git a/steps-guix/libffi-3.5.2/sources b/steps-guix/libffi-3.5.2/sources new file mode 100644 index 00000000..19abafa0 --- /dev/null +++ b/steps-guix/libffi-3.5.2/sources @@ -0,0 +1 @@ +f https://github.com/libffi/libffi/releases/download/v3.5.2/libffi-3.5.2.tar.gz f3a3082a23b37c293a4fcd1053147b371f2ff91fa7ea1b2a52e335676bac82dc diff --git a/steps-guix/manifest b/steps-guix/manifest index 47884f53..35893719 100644 --- a/steps-guix/manifest +++ b/steps-guix/manifest @@ -55,6 +55,7 @@ build: patch-2.7.6 build: bash-5.3-1 build: static-binaries-0-i686-linux # Build guile-static-stripped-2.2.4-i686-linux.tar.xz +build: libffi-3.5.2 build: guile-2.2.4 # Build mes-minimal-stripped-0.19-i686-linux.tar.xz build: mes-minimal-stripped-0.19-i686-linux