guile: fix readline support (use with libffi-3.4.3)

Fix readline dependencies. Working readline can be verified in guile via
(begin (use-modules (ice-9 readline)) (activate-readline))

Use with libffi-3.4.3 to ensure guile test-suite/standalone/test-ffi
passes.

Patch 0104-test-ffi.patch is not needed since issue is addressed in
0101-In-tests-add-dynamic-link-to-msys-2.0-for-host-type-msys.patch
This commit is contained in:
Hannes Müller
2022-09-20 20:49:01 +02:00
parent e2dd58640f
commit 40be531cb9
2 changed files with 18 additions and 24 deletions

View File

@@ -1,16 +0,0 @@
--- guile-2.0.14/test-suite/standalone/test-ffi 2013-03-01 17:50:05.000000000 +0100
+++ b/test-suite/standalone/test-ffi 2017-03-25 12:49:48.062647800 +0100
@@ -266,11 +266,11 @@
(define global (dynamic-link))
(define strerror
- (pointer->procedure '* (dynamic-func "strerror" global)
+ (pointer->procedure '* (dynamic-func "strerror" (dynamic-link "msys-2.0"))
(list int)))
(define strlen
- (pointer->procedure size_t (dynamic-func "strlen" global)
+ (pointer->procedure size_t (dynamic-func "strlen" (dynamic-link "msys-2.0"))
(list '*)))
(let* ((ptr (strerror ENOENT))

View File

@@ -3,25 +3,25 @@
pkgbase=guile
pkgname=("$pkgbase" "lib${pkgbase}" "lib${pkgbase}-devel")
pkgver=2.2.7
pkgrel=3
pkgrel=4
pkgdesc="a portable, embeddable Scheme implementation written in C"
url="https://www.gnu.org/software/guile/"
arch=(i686 x86_64)
license=('GPL')
makedepends=('libltdl' 'gmp-devel' 'ncurses-devel' 'libunistring-devel' 'libgc-devel' 'libffi-devel' 'texinfo' 'autotools' 'gcc' 'make')
makedepends=('autotools' 'gcc' 'gmp-devel' 'libffi-devel' 'libgc-devel'
'libltdl' 'libreadline-devel' 'libunistring-devel' 'make'
'ncurses-devel' 'texinfo')
source=("https://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"
0002-Remove-version-in-file-name-of-dynamic-library-guile.patch
0101-In-tests-add-dynamic-link-to-msys-2.0-for-host-type-msys.patch
0102-Skip-tests-using-setrlimit-for-MSYS-as-done-for-Cygwin.patch
0103-Activate-test-pthread-create-secondary-for-CYGWIN-MSYS.patch
0104-test-ffi.patch)
0103-Activate-test-pthread-create-secondary-for-CYGWIN-MSYS.patch)
options=('!libtool')
sha256sums=('cdf776ea5f29430b1258209630555beea6d2be5481f9da4d64986b077ff37504'
'440d31e6100bf896fcd5d65209da42bfeec43f154fa023fceeae911194ecb15c'
'7b06f92cca1b10f1006f53f27b0ed0c653eaa3a1de3732b69364e28b1b36fd1e'
'31124d7053454eb082a815b8d15249621dfb92aff50400090854d1f47b174f25'
'b66d33a35942c4d4575d169974f91f3e525f6de4fb82e61dc70723e0a43123d6'
'f4a79641ed42f11a2dd000e38ca44fbde4fcdae4383b99e3dff04ff0fd5987fe')
'b66d33a35942c4d4575d169974f91f3e525f6de4fb82e61dc70723e0a43123d6')
prepare() {
cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -31,7 +31,6 @@ prepare() {
patch -p1 -i ${srcdir}/0101-In-tests-add-dynamic-link-to-msys-2.0-for-host-type-msys.patch
patch -p1 -i ${srcdir}/0102-Skip-tests-using-setrlimit-for-MSYS-as-done-for-Cygwin.patch
patch -p1 -i ${srcdir}/0103-Activate-test-pthread-create-secondary-for-CYGWIN-MSYS.patch
patch -p1 -i ${srcdir}/0104-test-ffi.patch
#cp -rf build-aux/snippet ${srcdir}/snippet
autoreconf -fi
@@ -59,8 +58,19 @@ build() {
make DESTDIR="${srcdir}/dest" install
}
check() {
cd "${srcdir}/${pkgbase}-${pkgver}"
# make -i check
# echo " **** Running last tests in a complete way ****"
# for i in ./test-suite/tests/*.test
# do ./check-guile $(basename $i) || true
# done
}
package_guile() {
depends=("libguile=${pkgver}")
depends=("libguile=${pkgver}" libreadline)
mkdir -p ${pkgdir}/usr/bin
cp -rf ${srcdir}/dest/usr/bin ${pkgdir}/usr/