From 963d69b2bd0b0903d9409d6aa0256f0bdcd154bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 29 Aug 2020 20:22:49 +0200 Subject: [PATCH] guile1.8: fix build and xlint Guile1.8 segfaults if built with the in-tree lt-guile. Work around this issue by using guile 2.0.14 for the build. --- srcpkgs/guile1.8/template | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/srcpkgs/guile1.8/template b/srcpkgs/guile1.8/template index 3954360e9e1..2f575000cbf 100644 --- a/srcpkgs/guile1.8/template +++ b/srcpkgs/guile1.8/template @@ -1,24 +1,20 @@ # Template file for 'guile1.8' -pkgname="guile1.8" -version="1.8.8" +pkgname=guile1.8 +version=1.8.8 revision=3 wrksrc=${pkgname/1.8/}-${version} build_style="gnu-configure" -hostmakedepends="pkg-config" -makedepends="gmp-devel libltdl-devel ncurses-devel readline-devel" configure_args="--disable-static --disable-error-on-warning --program-suffix='-1.8'" -short_desc="A portable, embeddable Scheme implementation written in C" +make_build_args="GUILE_FOR_BUILD=guile" +hostmakedepends="pkg-config guile" +makedepends="gmp-devel libltdl-devel ncurses-devel readline-devel" +short_desc="Portable, embeddable Scheme implementation written in C" maintainer="newbluemoon " +license="LGPL-2.1-or-later" homepage="https://www.gnu.org/software/guile/guile.html" -license="LGPL-2.1" distfiles="${GNU_SITE}/${pkgname/1.8/}/${pkgname/1.8/}-${version}.tar.gz" checksum=c3471fed2e72e5b04ad133bbaaf16369e8360283679bcf19800bc1b381024050 -if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" guile1.8" - make_build_args="GUILE_FOR_BUILD=guile-1.8" -fi - post_install() { # conflicts with guile-2.0 rm -rf ${DESTDIR}/usr/share/info @@ -36,4 +32,3 @@ guile1.8-devel_package() { mv ${PKGDESTDIR}/usr/share/aclocal/{guile.m4,guile-1.8.m4} } } -