diff options
| -rw-r--r-- | user/guile/APKBUILD | 14 | ||||
| -rw-r--r-- | user/guile/sltdl-ize.patch | 12 |
2 files changed, 22 insertions, 4 deletions
diff --git a/user/guile/APKBUILD b/user/guile/APKBUILD index 871131af0..608cac566 100644 --- a/user/guile/APKBUILD +++ b/user/guile/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Zach van Rijn <me@zv.io> pkgname=guile pkgver=2.2.7 -pkgrel=1 +pkgrel=2 pkgdesc="Portable, embeddable Scheme implementation written in C" url="https://www.gnu.org/software/guile/" arch="all" @@ -10,10 +10,11 @@ license="LGPL-3.0+ AND GPL-3.0+" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" depends="" depends_dev="guile gc-dev" -makedepends="gc-dev gmp-dev libffi-dev libtool libunistring-dev ncurses-dev - texinfo" +makedepends="autoconf automake gc-dev gmp-dev libffi-dev slibtool + libunistring-dev ncurses-dev sltdl-dev texinfo" source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz 0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch + sltdl-ize.patch " prepare() { @@ -22,6 +23,10 @@ prepare() { case "$CARCH" in ppc) rm -fvr prebuilt/32-bit-big-endian; ;; #533 esac + export LIBTOOL="slibtool" + export LIBTOOLIZE="slibtoolize" + export ACLOCAL_PATH="/usr/share/slibtool:$ACLOCAL_PATH" + autoreconf -if } build() { @@ -40,4 +45,5 @@ package() { } sha512sums="ad11885ffeb7655ef6c8543e67233992dc37bdcf91ed82188e6a144169c6b7d4e31cf7a6d01509c573d00904cb002719b851f71cdf1359a86de401daf613d773 guile-2.2.7.tar.gz -b1c309cc07830ff1741ef88857f8099187b449580e8d57862886abc367ef1accc5a35636d81eee09247f13d3a751cdc8909fdea05368d3d509bd2039ce06d078 0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch" +b1c309cc07830ff1741ef88857f8099187b449580e8d57862886abc367ef1accc5a35636d81eee09247f13d3a751cdc8909fdea05368d3d509bd2039ce06d078 0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch +ecea6afc934407dd4e9af999279a284516bb18fc93c20c93179b5e16766d6cd78b9a40ae3aff5c6419e54e694956ea975f98875bc551275e22b2695e1986bff4 sltdl-ize.patch" diff --git a/user/guile/sltdl-ize.patch b/user/guile/sltdl-ize.patch new file mode 100644 index 000000000..349e4d016 --- /dev/null +++ b/user/guile/sltdl-ize.patch @@ -0,0 +1,12 @@ +diff '--color=auto' -Nurd guile-2.2.7/configure.ac guile-2.2.7.new/configure.ac +--- guile-2.2.7/configure.ac 2019-07-07 06:07:33.000000000 -0700 ++++ guile-2.2.7.new/configure.ac 2025-06-14 20:47:17.684958649 -0700 +@@ -108,7 +108,7 @@ + AM_CONDITIONAL([HAVE_SHARED_LIBRARIES], [test "x$enable_shared" = "xyes"]) + + dnl Check for libltdl. +-AC_LIB_HAVE_LINKFLAGS([ltdl], [], [#include <ltdl.h>], ++AC_LIB_HAVE_LINKFLAGS([sltdl], [], [#include <ltdl.h>], + [lt_dlopenext ("foo");]) + if test "x$HAVE_LIBLTDL" != "xyes"; then + AC_MSG_ERROR([GNU libltdl (Libtool) not found, see README.]) |