From 612a9d9976dcfad887c0c37a0eb4b62e950483a0 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Mon, 14 Jan 2019 13:40:11 -0200 Subject: [PATCH] swi-prolog: update to 8.0.0. --- common/shlibs | 2 +- srcpkgs/swi-prolog/template | 42 +++++++++++-------------------------- 2 files changed, 13 insertions(+), 31 deletions(-) diff --git a/common/shlibs b/common/shlibs index 3acac1a694..c90e2f0dbd 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2695,7 +2695,7 @@ libKPropertyWidgets3.so.4 kproperty-3.1.0_1 libKPropertyCore3.so.4 kproperty-3.1.0_1 libKReport3.so.4 kreport-3.1.0_1 libbotan-2.so.8 botan-2.8.0_1 -libswipl.so.7.6 swi-prolog-7.6.0_1 +libswipl.so.8 swi-prolog-8.0.0_1 libpcre2-16.so.0 libpcre2-10.22_1 libpcre2-32.so.0 libpcre2-10.22_1 libpcre2-8.so.0 libpcre2-10.22_1 diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template index 09acae3ef5..63d51eb8cc 100644 --- a/srcpkgs/swi-prolog/template +++ b/srcpkgs/swi-prolog/template @@ -1,41 +1,23 @@ # Template file for 'swi-prolog' pkgname=swi-prolog -version=7.6.4 -revision=4 +version=8.0.0 +revision=1 wrksrc="swipl-${version}" -build_style=gnu-configure +build_style=cmake +configure_args="-DBUILD_TESTING=OFF" hostmakedepends="pkg-config" makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel - unixodbc-devel zlib-devel" + unixodbc-devel zlib-devel pcre-devel libyaml-devel" short_desc="Comprehensive free Prolog environment" maintainer="Leah Neukirchen " -license="LGPL-2.1" +license="LGPL-2.1-or-later" homepage="http://www.swi-prolog.org/" -_changelog="http://www.swi-prolog.org/ChangeLog?branch=stable" +changelog="http://www.swi-prolog.org/ChangeLog?branch=stable" distfiles="http://www.swi-prolog.org/download/stable/src/swipl-${version}.tar.gz" -checksum=2d3d7aabd6d99a02dcc2da5d7604e3500329e541c6f857edc5aa06a3b1267891 -nocross=yes +checksum=422b6985c6f646b5bb73b160e8c8cda74e892548beb6a672828e3689a20a6b32 +nocross="uses TRY_RUN() to test features" -post_extract() { - case "$XBPS_TARGET_MACHINE" in - *-musl) - sed -i 's/unsigned int line/int line/' src/pl-thread.c - sed -i '1i#include ' src/pl-trace.c src/os/pl-fmt.c - esac -} -do_configure() { - case "$XBPS_TARGET_MACHINE" in - *-musl) - # Work around lack of qsort_r, needs executable stack. - CFLAGS+=" -DQSORT_WITH_NESTED_FUNCTIONS" - LDFLAGS+=" -Wl,-z,execstack" - esac - COFLAGS="${CFLAGS}" ./configure ${configure_args} \ - --with-world -} -post_install() { - chmod +x "${DESTDIR}/usr/lib/swipl-${version}/library/dialect/sicstus/swipl-lfr.pl" - ln -sfr ${DESTDIR}/usr/lib/swipl-${version}/lib/*/libswipl.so.${version} \ - ${DESTDIR}/usr/lib/libswipl.so.${version%.*} -} +case "$XBPS_TARGET_MACHINE" in + i686*) broken="swipl-8.0.0/build/packages/ssl/mkcerts.pl:51: mkcerts:main openssl failed with status exit(1)" ;; +esac