From fa2a3b617e7efa84fd010d64c66de43c163ff941 Mon Sep 17 00:00:00 2001 From: "B. Wilson" Date: Thu, 30 Jan 2020 14:15:00 +0900 Subject: [PATCH] j: update to 901.e. --- srcpkgs/j/patches/fix-cip.c-includes.patch | 34 ++++++++++++++++++++++ srcpkgs/j/template | 5 ++-- srcpkgs/j/update | 6 ---- 3 files changed, 36 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/j/patches/fix-cip.c-includes.patch delete mode 100644 srcpkgs/j/update diff --git a/srcpkgs/j/patches/fix-cip.c-includes.patch b/srcpkgs/j/patches/fix-cip.c-includes.patch new file mode 100644 index 00000000000..9782839ff1d --- /dev/null +++ b/srcpkgs/j/patches/fix-cip.c-includes.patch @@ -0,0 +1,34 @@ +--- jsrc/cip.c 2020-01-30 13:31:22.463687182 +0900 ++++ jsrc/cip.c 2020-01-30 13:33:47.707458248 +0900 +@@ -3,9 +3,9 @@ + /* */ + /* Conjunctions: Inner Product */ + +-#include "../../jsource/jsrc/j.h" +-#include "../../jsource/jsrc/vasm.h" +-#include "../../jsource/jsrc/gemm.h" ++#include "j.h" ++#include "vasm.h" ++#include "gemm.h" + + #define MAXAROWS 384 // max rows of a that we can process to stay in L2 cache a strip is m*CACHEHEIGHT, z strip is m*CACHEWIDTH this is wired to 128*3 - check if you chage + +@@ -1057,15 +1057,15 @@ + switch(c){ + case CPLUSDOT: + #define F |= +-#include "../../jsource/jsrc/cip_t.h" ++#include "cip_t.h" + break; + case CSTARDOT: + #define F &= +-#include "../../jsource/jsrc/cip_t.h" ++#include "cip_t.h" + break; + case CNE: + #define F ^= +-#include "../../jsource/jsrc/cip_t.h" ++#include "cip_t.h" + break; + } + R z; diff --git a/srcpkgs/j/template b/srcpkgs/j/template index 3874aa484ff..3b047644df3 100644 --- a/srcpkgs/j/template +++ b/srcpkgs/j/template @@ -1,20 +1,19 @@ # Template file for 'j' pkgname=j _vmaj=901 -_vmin=d +_vmin=e _vrel=${_vmaj}-release${_vmin:+-}${_vmin} version=${_vmaj}.${_vmin} revision=1 archs="aarch64* x86_64*" wrksrc="jsource-j${_vrel}" -hostmakedepends="bc" makedepends="libedit-devel libgomp-devel libomp-devel" short_desc="Modern, high-performance, ASCII-based successor to APL" maintainer="B. Wilson " license="GPL-3.0-or-later" homepage="https://jsoftware.com/" distfiles="https://github.com/jsoftware/jsource/archive/j${_vrel}.tar.gz" -checksum=5d581c3587253566375f4229dd76ec4108f6eea80d7e4ccf5725328c9f8b408a +checksum=23d1cac75ae8426d4e301b178fac1f29e85d7a0c80cefe4740c104d9c1eeab7a _jsz="j${XBPS_TARGET_WORDSIZE}" _jtype="release" diff --git a/srcpkgs/j/update b/srcpkgs/j/update deleted file mode 100644 index 93b92393490..00000000000 --- a/srcpkgs/j/update +++ /dev/null @@ -1,6 +0,0 @@ -site='https://github.com/jsoftware/jsource/releases' -_vmaj=${version%.*} -_vmin=${version#${_vmaj}} -_vmin=${_vmin#.} -version="${_vmaj}-release${_vmin:+-}${_vmin}" -pattern='tag/j\K[\d]+-release(-.*)?(?=">)'