guile: update to 3.0.8

This commit is contained in:
Chongyun Lee 2022-10-06 22:53:11 +08:00 committed by Uchiha Kakashi
parent a1cbe3d4d8
commit e1e7bf4acb
2 changed files with 22 additions and 5 deletions

View File

@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/guile/
TERMUX_PKG_DESCRIPTION="Portable, embeddable Scheme implementation written in C"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=2.2.7
TERMUX_PKG_REVISION=3
TERMUX_PKG_SRCURL=https://ftp.gnu.org/gnu/guile/guile-$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=44b4c5fbbe257ccdebea18420212c9b3e90c3c86a54920d8554039fc6769a007
TERMUX_PKG_VERSION=3.0.8
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/guile/guile-$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=f25ae0c26e911af1b5005292d4f56621879f74d6958b30741cf67d8b6feb2016
TERMUX_PKG_DEPENDS="libandroid-support, libffi, libgc, libgmp, libltdl, libunistring"
TERMUX_PKG_BUILD_DEPENDS="libtool"
TERMUX_PKG_BREAKS="guile-dev"
@ -13,6 +12,7 @@ TERMUX_PKG_REPLACES="guile-dev"
TERMUX_PKG_CONFLICTS="guile18"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_type_complex_double=no ac_cv_search_clock_getcpuclockid=false ac_cv_func_GC_move_disappearing_link=yes ac_cv_func_GC_is_heap_ptr=yes"
TERMUX_PKG_HOSTBUILD=true
TERMUX_PKG_BUILD_IN_SRC=true
termux_step_host_build() {
mkdir HOSTBUILDINSTALL
@ -23,11 +23,14 @@ termux_step_host_build() {
}
termux_step_pre_configure() {
export GUILE_FOR_BUILD="$TERMUX_PKG_HOSTBUILD_DIR"/HOSTBUILDINSTALL/bin/guile
export LD_LIBRARY_PATH="$TERMUX_PKG_HOSTBUILD_DIR"/HOSTBUILDINSTALL/lib
}
termux_step_post_configure() {
cp $TERMUX_PKG_BUILDER_DIR/malloc.h $TERMUX_PKG_BUILDDIR/lib/
}
termux_step_post_massage() {
sed -i 's',"$TERMUX_STANDALONE_TOOLCHAIN/bin/$TERMUX_HOST_PLATFORM-pkg-config","$TERMUX_PREFIX/bin/pkg-config",'g' $TERMUX_PKG_MASSAGEDIR$TERMUX_PREFIX/bin/guile-config
}

14
packages/guile/malloc.h Normal file
View File

@ -0,0 +1,14 @@
// XXX: For some reasons, struct FILE is not properly declared in guile's wrapper of <stdlib.h>.
// XXX: Add a wrapper of <malloc.h> to avoid the following error.
// In file included from localcharset.c:26:
// In file included from ./stdio.h:43:
// In file included from /home/builder/.termux-build/_cache/android-r23c-api-24-v0/bin/../sysroot/usr/include/stdio.h:47:
// In file included from ./string.h:52:
// In file included from ./stdlib.h:36:
// In file included from /home/builder/.termux-build/_cache/android-r23c-api-24-v0/bin/../sysroot/usr/include/stdlib.h:34:
// /home/builder/.termux-build/_cache/android-r23c-api-24-v0/bin/../sysroot/usr/include/malloc.h:168:37: error: unknown type name 'FILE'
#pragma once
struct __sFILE;
typedef struct __sFILE FILE;
#include_next <malloc.h>