snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

swi-prolog: update to 7.2.0.

This commit is contained in:
Christian Neukirchen 2015-05-22 13:12:33 +02:00
parent 31d252c987
commit d9116dbf3c
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
srcpkgs/swi-prolog/patches/libressl.patch
View File

@ -1,8 +1,6 @@
Remove SSL2 key material support. --- packages/ssl/ssl4pl.c.orig 2015-05-20 10:50:57.000000000 +0200
+++ packages/ssl/ssl4pl.c 2015-05-22 10:49:33.347337844 +0200
--- packages/ssl/ssl4pl.c.orig 2014-09-22 22:06:43.891493659 +0200 @@ -84,7 +84,6 @@
+++ packages/ssl/ssl4pl.c 2014-09-22 22:07:17.743494074 +0200
@@ -67,7 +67,6 @@
static functor_t FUNCTOR_crl1; static functor_t FUNCTOR_crl1;
static functor_t FUNCTOR_revocations1; static functor_t FUNCTOR_revocations1;
static functor_t FUNCTOR_revoked2; static functor_t FUNCTOR_revoked2;
@ -10,21 +8,18 @@ Remove SSL2 key material support.
static functor_t FUNCTOR_master_key1; static functor_t FUNCTOR_master_key1;
static functor_t FUNCTOR_session_id1; static functor_t FUNCTOR_session_id1;
static functor_t FUNCTOR_client_random1; static functor_t FUNCTOR_client_random1;
@@ -1537,13 +1536,6 @@ @@ -1736,10 +1735,6 @@
PL_INTEGER, (int)session->ssl_version)) PL_INTEGER, (int)session->ssl_version))
return FALSE; return FALSE;
- if ( !PL_unify_list_ex(list_t, node_t, list_t) ) - if ( !add_key_string(list_t, FUNCTOR_session_key1,
- return FALSE; - session->key_arg_length, session->key_arg) )
- if ( !PL_unify_term(node_t,
- PL_FUNCTOR, FUNCTOR_session_key1,
- PL_NCHARS, session->key_arg_length, session->key_arg))
- return FALSE; - return FALSE;
- -
if ( !PL_unify_list_ex(list_t, node_t, list_t)) if ( !add_key_string(list_t, FUNCTOR_master_key1,
session->master_key_length, session->master_key) )
return FALSE; return FALSE;
if ( !PL_unify_term(node_t, @@ -1860,7 +1855,6 @@
@@ -1624,7 +1616,6 @@
FUNCTOR_crl1 = PL_new_functor(PL_new_atom("crl"), 1); FUNCTOR_crl1 = PL_new_functor(PL_new_atom("crl"), 1);
FUNCTOR_revoked2 = PL_new_functor(PL_new_atom("revoked"), 2); FUNCTOR_revoked2 = PL_new_functor(PL_new_atom("revoked"), 2);
FUNCTOR_revocations1 = PL_new_functor(PL_new_atom("revocations"), 1); FUNCTOR_revocations1 = PL_new_functor(PL_new_atom("revocations"), 1);

20
srcpkgs/swi-prolog/template
View File

@ -1,8 +1,8 @@
# Template file for 'swi-prolog' # Template file for 'swi-prolog'
pkgname=swi-prolog pkgname=swi-prolog
version=6.6.6 version=7.2.0
revision=5 revision=1
wrksrc="pl-${version}" wrksrc="swipl-${version}"
build_style=gnu-configure build_style=gnu-configure
hostmakedepends="pkg-config" hostmakedepends="pkg-config"
makedepends="gmp-devel readline-devel libressl-devel zlib-devel libarchive-devel libXft-devel libjpeg-turbo-devel libXpm-devel libXinerama-devel unixodbc-devel libXt-devel" makedepends="gmp-devel readline-devel libressl-devel zlib-devel libarchive-devel libXft-devel libjpeg-turbo-devel libXpm-devel libXinerama-devel unixodbc-devel libXt-devel"
@ -10,16 +10,24 @@ short_desc="A comprehensive free Prolog environment"
maintainer="Christian Neukirchen <chneukirchen@gmail.com>" maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
license="LGPL-2.1" license="LGPL-2.1"
homepage="http://www.swi-prolog.org/" homepage="http://www.swi-prolog.org/"
distfiles="http://www.swi-prolog.org/download/stable/src/pl-${version}.tar.gz" distfiles="http://www.swi-prolog.org/download/stable/src/swipl-${version}.tar.gz"
checksum=9f80bb274e2f31fd68b0acbe35982c012d5f8311dbe44ec1d8d04351a776996d checksum=801423b8293d08b96b575ffa96d91cce3acf2473f04c23d58657dd668287f8cb
nocross=yes nocross=yes
post_extract() { post_extract() {
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
*-musl) sed -i 's/unsigned int line/int line/' src/pl-thread.c *-musl)
sed -i 's/unsigned int line/int line/' src/pl-thread.c
sed -i '1i#include <stdio.h>' src/pl-trace.c src/os/pl-fmt.c
esac esac
} }
do_configure() { 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} \ COFLAGS="${CFLAGS}" ./configure ${configure_args} \
--with-world --enable-custom-flags --with-world --enable-custom-flags
} }