* [PR PATCH] [WIP] j: update to 9.4.3.
@ 2023-12-11 21:34 Eloitor
2023-12-12 14:00 ` [PR PATCH] [Updated] " Eloitor
` (12 more replies)
0 siblings, 13 replies; 14+ messages in thread
From: Eloitor @ 2023-12-11 21:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 881 bytes --]
There is a new pull request by Eloitor against master on the void-packages repository
https://github.com/Eloitor/void-packages j
https://github.com/void-linux/void-packages/pull/47703
[WIP] j: update to 9.4.3.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
Currently build fails with
```
=> j-9.4.3_1: running post-install hook: 11-pkglint-elf-in-usrshare ...
=> ERROR: j-9.4.3_1: ELF files found in /usr/share:
=> ERROR: /usr/share/j/tools/regex/raspberry/j32/libjpcre2.so
=> ERROR: /usr/share/j/tools/regex/raspberry/j64/libjpcre2.so
=> ERROR: /usr/share/j/tools/regex/libjpcre2.so
=> ERROR: j-9.4.3_1: cannot continue with installation!
```
A patch file from https://github.com/void-linux/void-packages/pull/47703.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-j-47703.patch --]
[-- Type: text/x-diff, Size: 2694 bytes --]
From a22701ee2539d9d2c47c099cf0b98fbfb6d57eb6 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@duck.com>
Date: Mon, 11 Dec 2023 22:32:29 +0100
Subject: [PATCH] j: update to 9.4.3.
---
srcpkgs/j/patches/fix-cip.c-includes.patch | 34 ----------------------
srcpkgs/j/template | 11 +++----
2 files changed, 4 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/j/patches/fix-cip.c-includes.patch
diff --git a/srcpkgs/j/patches/fix-cip.c-includes.patch b/srcpkgs/j/patches/fix-cip.c-includes.patch
deleted file mode 100644
index 7601d17006296..0000000000000
--- a/srcpkgs/j/patches/fix-cip.c-includes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/jsrc/cip.c 2020-01-30 13:31:22.463687182 +0900
-+++ b/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 95aa0710684dc..4ec954e2c6318 100644
--- a/srcpkgs/j/template
+++ b/srcpkgs/j/template
@@ -1,18 +1,15 @@
# Template file for 'j'
pkgname=j
-version=901.f
+version=9.4.3
revision=1
-_vmaj="${version%.*}"
-_vmin="${version#${_vmaj}}"
-_vrel=${_vmaj}-release${_vmin:+-}${_vmin#.}
archs="aarch64* armv[67]* i686* x86_64*"
-makedepends="libedit-devel libgomp-devel"
+makedepends="libedit-devel libgomp-devel nasm"
short_desc="Modern, high-performance, ASCII-based successor to APL"
maintainer="B. Wilson <x@wilsonb.com>"
license="GPL-3.0-or-later"
homepage="https://jsoftware.com/"
-distfiles="https://github.com/jsoftware/jsource/archive/j${_vrel}.tar.gz"
-checksum=6b1cdcc1a0c3d955e400cf676f115de51ef9d1da495d08721ee999f48f6f9209
+distfiles="https://github.com/jsoftware/jsource/archive/refs/tags/${version}.tar.gz"
+checksum=55098a399e010bd8ae5e74523316959506ff69efa839098dddadd8960f6eaf55
_jsz="j${XBPS_TARGET_WORDSIZE}"
_jtype="release"
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] j: update to 9.4.3.
2023-12-11 21:34 [PR PATCH] [WIP] j: update to 9.4.3 Eloitor
@ 2023-12-12 14:00 ` Eloitor
2023-12-12 15:52 ` Eloitor
` (11 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Eloitor @ 2023-12-12 14:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 886 bytes --]
There is an updated pull request by Eloitor against master on the void-packages repository
https://github.com/Eloitor/void-packages j
https://github.com/void-linux/void-packages/pull/47703
[WIP] j: update to 9.4.3.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
Currently build fails with
```
=> j-9.4.3_1: running post-install hook: 11-pkglint-elf-in-usrshare ...
=> ERROR: j-9.4.3_1: ELF files found in /usr/share:
=> ERROR: /usr/share/j/tools/regex/raspberry/j32/libjpcre2.so
=> ERROR: /usr/share/j/tools/regex/raspberry/j64/libjpcre2.so
=> ERROR: /usr/share/j/tools/regex/libjpcre2.so
=> ERROR: j-9.4.3_1: cannot continue with installation!
```
A patch file from https://github.com/void-linux/void-packages/pull/47703.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-j-47703.patch --]
[-- Type: text/x-diff, Size: 2712 bytes --]
From 54e58ce20a67a7d56658a4eae2a0e638ff93ffd9 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@duck.com>
Date: Mon, 11 Dec 2023 22:32:29 +0100
Subject: [PATCH] j: update to 9.4.3.
---
srcpkgs/j/patches/fix-cip.c-includes.patch | 34 ----------------------
srcpkgs/j/template | 12 ++++----
2 files changed, 5 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/j/patches/fix-cip.c-includes.patch
diff --git a/srcpkgs/j/patches/fix-cip.c-includes.patch b/srcpkgs/j/patches/fix-cip.c-includes.patch
deleted file mode 100644
index 7601d17006296..0000000000000
--- a/srcpkgs/j/patches/fix-cip.c-includes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/jsrc/cip.c 2020-01-30 13:31:22.463687182 +0900
-+++ b/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 95aa0710684dc..c971eee4dd44c 100644
--- a/srcpkgs/j/template
+++ b/srcpkgs/j/template
@@ -1,18 +1,16 @@
# Template file for 'j'
pkgname=j
-version=901.f
+reverts=901.f_1
+version=9.4.3
revision=1
-_vmaj="${version%.*}"
-_vmin="${version#${_vmaj}}"
-_vrel=${_vmaj}-release${_vmin:+-}${_vmin#.}
archs="aarch64* armv[67]* i686* x86_64*"
-makedepends="libedit-devel libgomp-devel"
+makedepends="libedit-devel libgomp-devel nasm"
short_desc="Modern, high-performance, ASCII-based successor to APL"
maintainer="B. Wilson <x@wilsonb.com>"
license="GPL-3.0-or-later"
homepage="https://jsoftware.com/"
-distfiles="https://github.com/jsoftware/jsource/archive/j${_vrel}.tar.gz"
-checksum=6b1cdcc1a0c3d955e400cf676f115de51ef9d1da495d08721ee999f48f6f9209
+distfiles="https://github.com/jsoftware/jsource/archive/refs/tags/${version}.tar.gz"
+checksum=55098a399e010bd8ae5e74523316959506ff69efa839098dddadd8960f6eaf55
_jsz="j${XBPS_TARGET_WORDSIZE}"
_jtype="release"
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] j: update to 9.4.3.
2023-12-11 21:34 [PR PATCH] [WIP] j: update to 9.4.3 Eloitor
2023-12-12 14:00 ` [PR PATCH] [Updated] " Eloitor
@ 2023-12-12 15:52 ` Eloitor
2023-12-12 16:16 ` Eloitor
` (10 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Eloitor @ 2023-12-12 15:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 886 bytes --]
There is an updated pull request by Eloitor against master on the void-packages repository
https://github.com/Eloitor/void-packages j
https://github.com/void-linux/void-packages/pull/47703
[WIP] j: update to 9.4.3.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
Currently build fails with
```
=> j-9.4.3_1: running post-install hook: 11-pkglint-elf-in-usrshare ...
=> ERROR: j-9.4.3_1: ELF files found in /usr/share:
=> ERROR: /usr/share/j/tools/regex/raspberry/j32/libjpcre2.so
=> ERROR: /usr/share/j/tools/regex/raspberry/j64/libjpcre2.so
=> ERROR: /usr/share/j/tools/regex/libjpcre2.so
=> ERROR: j-9.4.3_1: cannot continue with installation!
```
A patch file from https://github.com/void-linux/void-packages/pull/47703.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-j-47703.patch --]
[-- Type: text/x-diff, Size: 3507 bytes --]
From d9df0cc12548553afc36c77ac146190f1de1de00 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@duck.com>
Date: Mon, 11 Dec 2023 22:32:29 +0100
Subject: [PATCH] j: update to 9.4.3.
---
srcpkgs/j/patches/fix-cip.c-includes.patch | 34 ----------------------
srcpkgs/j/template | 25 +++++++++-------
2 files changed, 15 insertions(+), 44 deletions(-)
delete mode 100644 srcpkgs/j/patches/fix-cip.c-includes.patch
diff --git a/srcpkgs/j/patches/fix-cip.c-includes.patch b/srcpkgs/j/patches/fix-cip.c-includes.patch
deleted file mode 100644
index 7601d17006296..0000000000000
--- a/srcpkgs/j/patches/fix-cip.c-includes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/jsrc/cip.c 2020-01-30 13:31:22.463687182 +0900
-+++ b/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 95aa0710684dc..ebce84f0cd88d 100644
--- a/srcpkgs/j/template
+++ b/srcpkgs/j/template
@@ -1,18 +1,16 @@
# Template file for 'j'
pkgname=j
-version=901.f
+reverts=901.f_1
+version=9.4.3
revision=1
-_vmaj="${version%.*}"
-_vmin="${version#${_vmaj}}"
-_vrel=${_vmaj}-release${_vmin:+-}${_vmin#.}
archs="aarch64* armv[67]* i686* x86_64*"
-makedepends="libedit-devel libgomp-devel"
+makedepends="libedit-devel libgomp-devel nasm"
short_desc="Modern, high-performance, ASCII-based successor to APL"
maintainer="B. Wilson <x@wilsonb.com>"
license="GPL-3.0-or-later"
homepage="https://jsoftware.com/"
-distfiles="https://github.com/jsoftware/jsource/archive/j${_vrel}.tar.gz"
-checksum=6b1cdcc1a0c3d955e400cf676f115de51ef9d1da495d08721ee999f48f6f9209
+distfiles="https://github.com/jsoftware/jsource/archive/refs/tags/${version}.tar.gz"
+checksum=55098a399e010bd8ae5e74523316959506ff69efa839098dddadd8960f6eaf55
_jsz="j${XBPS_TARGET_WORDSIZE}"
_jtype="release"
@@ -125,13 +123,20 @@ JC
}
do_install() {
+ vmkdir "${_jlib}" 0755
+ ls jlibrary/tools/regex
+ vcopy jlibrary/tools/regex/libjpcre2.so "${_jlib}"
+ vcopy jlibrary/tools/regex/raspberry/j32/libjpcre2.so "${_jlib}"
+ vcopy jlibrary/tools/regex/raspberry/j64/libjpcre2.so "${_jlib}"
+ rm jlibrary/tools/regex/libjpcre2.so
+ rm jlibrary/tools/regex/raspberry/j32/libjpcre2.so
+ rm jlibrary/tools/regex/raspberry/j64/libjpcre2.so
+ vcopy "bin/${_jpl}/*" "${_jlib}"
+
vmkdir "${_jshare}" 0755
vcopy jlibrary/system "${_jshare}"
vcopy jlibrary/tools "${_jshare}"
- vmkdir "${_jlib}" 0755
- vcopy "bin/${_jpl}/*" "${_jlib}"
-
vmkdir "${_jetc}" 0755
vinstall "${FILESDIR}/profilex_template.ijs" 644 "${_jetc}"
vinstall "jlibrary/bin/profile.ijs.new" 644 "${_jetc}" profile.ijs
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] j: update to 9.4.3.
2023-12-11 21:34 [PR PATCH] [WIP] j: update to 9.4.3 Eloitor
2023-12-12 14:00 ` [PR PATCH] [Updated] " Eloitor
2023-12-12 15:52 ` Eloitor
@ 2023-12-12 16:16 ` Eloitor
2023-12-12 16:17 ` Eloitor
` (9 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Eloitor @ 2023-12-12 16:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 886 bytes --]
There is an updated pull request by Eloitor against master on the void-packages repository
https://github.com/Eloitor/void-packages j
https://github.com/void-linux/void-packages/pull/47703
[WIP] j: update to 9.4.3.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
Currently build fails with
```
=> j-9.4.3_1: running post-install hook: 11-pkglint-elf-in-usrshare ...
=> ERROR: j-9.4.3_1: ELF files found in /usr/share:
=> ERROR: /usr/share/j/tools/regex/raspberry/j32/libjpcre2.so
=> ERROR: /usr/share/j/tools/regex/raspberry/j64/libjpcre2.so
=> ERROR: /usr/share/j/tools/regex/libjpcre2.so
=> ERROR: j-9.4.3_1: cannot continue with installation!
```
A patch file from https://github.com/void-linux/void-packages/pull/47703.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-j-47703.patch --]
[-- Type: text/x-diff, Size: 3596 bytes --]
From e1eb7a72af631d92850ef7c6f92b6ea3b049cdc8 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@duck.com>
Date: Mon, 11 Dec 2023 22:32:29 +0100
Subject: [PATCH] j: update to 9.4.3.
---
srcpkgs/j/patches/fix-cip.c-includes.patch | 34 ----------------------
srcpkgs/j/template | 28 +++++++++++-------
2 files changed, 17 insertions(+), 45 deletions(-)
delete mode 100644 srcpkgs/j/patches/fix-cip.c-includes.patch
diff --git a/srcpkgs/j/patches/fix-cip.c-includes.patch b/srcpkgs/j/patches/fix-cip.c-includes.patch
deleted file mode 100644
index 7601d17006296..0000000000000
--- a/srcpkgs/j/patches/fix-cip.c-includes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/jsrc/cip.c 2020-01-30 13:31:22.463687182 +0900
-+++ b/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 95aa0710684dc..50119a0f28183 100644
--- a/srcpkgs/j/template
+++ b/srcpkgs/j/template
@@ -1,18 +1,16 @@
# Template file for 'j'
pkgname=j
-version=901.f
+reverts=901.f_1
+version=9.4.3
revision=1
-_vmaj="${version%.*}"
-_vmin="${version#${_vmaj}}"
-_vrel=${_vmaj}-release${_vmin:+-}${_vmin#.}
archs="aarch64* armv[67]* i686* x86_64*"
-makedepends="libedit-devel libgomp-devel"
+makedepends="libedit-devel libgomp-devel nasm"
short_desc="Modern, high-performance, ASCII-based successor to APL"
maintainer="B. Wilson <x@wilsonb.com>"
license="GPL-3.0-or-later"
homepage="https://jsoftware.com/"
-distfiles="https://github.com/jsoftware/jsource/archive/j${_vrel}.tar.gz"
-checksum=6b1cdcc1a0c3d955e400cf676f115de51ef9d1da495d08721ee999f48f6f9209
+distfiles="https://github.com/jsoftware/jsource/archive/refs/tags/${version}.tar.gz"
+checksum=55098a399e010bd8ae5e74523316959506ff69efa839098dddadd8960f6eaf55
_jsz="j${XBPS_TARGET_WORDSIZE}"
_jtype="release"
@@ -125,13 +123,21 @@ JC
}
do_install() {
- vmkdir "${_jshare}" 0755
- vcopy jlibrary/system "${_jshare}"
- vcopy jlibrary/tools "${_jshare}"
-
vmkdir "${_jlib}" 0755
+ # ls jlibrary/tools/regex
+ # vcopy jlibrary/tools/regex/libjpcre2.so "${_jlib}"
+ # vcopy jlibrary/tools/regex/raspberry/j32/libjpcre2.so "${_jlib}"
+ # vcopy jlibrary/tools/regex/raspberry/j64/libjpcre2.so "${_jlib}"
+ # rm jlibrary/tools/regex/libjpcre2.so
+ # rm jlibrary/tools/regex/raspberry/j32/libjpcre2.so
+ # rm jlibrary/tools/regex/raspberry/j64/libjpcre2.so
vcopy "bin/${_jpl}/*" "${_jlib}"
+ # vmkdir "${_jshare}" 0755
+ vcopy jlibrary/system "${_jlib}"
+ vcopy jlibrary/tools "${_jlib}"
+ vcopy jlibrary/addons "${_jlib}"
+
vmkdir "${_jetc}" 0755
vinstall "${FILESDIR}/profilex_template.ijs" 644 "${_jetc}"
vinstall "jlibrary/bin/profile.ijs.new" 644 "${_jetc}" profile.ijs
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] j: update to 9.4.3.
2023-12-11 21:34 [PR PATCH] [WIP] j: update to 9.4.3 Eloitor
` (2 preceding siblings ...)
2023-12-12 16:16 ` Eloitor
@ 2023-12-12 16:17 ` Eloitor
2023-12-12 16:18 ` Eloitor
` (8 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Eloitor @ 2023-12-12 16:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 886 bytes --]
There is an updated pull request by Eloitor against master on the void-packages repository
https://github.com/Eloitor/void-packages j
https://github.com/void-linux/void-packages/pull/47703
[WIP] j: update to 9.4.3.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
Currently build fails with
```
=> j-9.4.3_1: running post-install hook: 11-pkglint-elf-in-usrshare ...
=> ERROR: j-9.4.3_1: ELF files found in /usr/share:
=> ERROR: /usr/share/j/tools/regex/raspberry/j32/libjpcre2.so
=> ERROR: /usr/share/j/tools/regex/raspberry/j64/libjpcre2.so
=> ERROR: /usr/share/j/tools/regex/libjpcre2.so
=> ERROR: j-9.4.3_1: cannot continue with installation!
```
A patch file from https://github.com/void-linux/void-packages/pull/47703.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-j-47703.patch --]
[-- Type: text/x-diff, Size: 3192 bytes --]
From cb4f54177092f07917b1d65549324f0abee0dd8a Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@duck.com>
Date: Mon, 11 Dec 2023 22:32:29 +0100
Subject: [PATCH] j: update to 9.4.3.
---
srcpkgs/j/patches/fix-cip.c-includes.patch | 34 ----------------------
srcpkgs/j/template | 21 +++++++------
2 files changed, 10 insertions(+), 45 deletions(-)
delete mode 100644 srcpkgs/j/patches/fix-cip.c-includes.patch
diff --git a/srcpkgs/j/patches/fix-cip.c-includes.patch b/srcpkgs/j/patches/fix-cip.c-includes.patch
deleted file mode 100644
index 7601d17006296..0000000000000
--- a/srcpkgs/j/patches/fix-cip.c-includes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/jsrc/cip.c 2020-01-30 13:31:22.463687182 +0900
-+++ b/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 95aa0710684dc..c682892a20433 100644
--- a/srcpkgs/j/template
+++ b/srcpkgs/j/template
@@ -1,18 +1,17 @@
# Template file for 'j'
+
pkgname=j
-version=901.f
+reverts=901.f_1
+version=9.4.3
revision=1
-_vmaj="${version%.*}"
-_vmin="${version#${_vmaj}}"
-_vrel=${_vmaj}-release${_vmin:+-}${_vmin#.}
archs="aarch64* armv[67]* i686* x86_64*"
-makedepends="libedit-devel libgomp-devel"
+makedepends="libedit-devel libgomp-devel nasm"
short_desc="Modern, high-performance, ASCII-based successor to APL"
maintainer="B. Wilson <x@wilsonb.com>"
license="GPL-3.0-or-later"
homepage="https://jsoftware.com/"
-distfiles="https://github.com/jsoftware/jsource/archive/j${_vrel}.tar.gz"
-checksum=6b1cdcc1a0c3d955e400cf676f115de51ef9d1da495d08721ee999f48f6f9209
+distfiles="https://github.com/jsoftware/jsource/archive/refs/tags/${version}.tar.gz"
+checksum=55098a399e010bd8ae5e74523316959506ff69efa839098dddadd8960f6eaf55
_jsz="j${XBPS_TARGET_WORDSIZE}"
_jtype="release"
@@ -125,13 +124,13 @@ JC
}
do_install() {
- vmkdir "${_jshare}" 0755
- vcopy jlibrary/system "${_jshare}"
- vcopy jlibrary/tools "${_jshare}"
-
vmkdir "${_jlib}" 0755
vcopy "bin/${_jpl}/*" "${_jlib}"
+ vcopy jlibrary/system "${_jlib}"
+ vcopy jlibrary/tools "${_jlib}"
+ vcopy jlibrary/addons "${_jlib}"
+
vmkdir "${_jetc}" 0755
vinstall "${FILESDIR}/profilex_template.ijs" 644 "${_jetc}"
vinstall "jlibrary/bin/profile.ijs.new" 644 "${_jetc}" profile.ijs
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] j: update to 9.4.3.
2023-12-11 21:34 [PR PATCH] [WIP] j: update to 9.4.3 Eloitor
` (3 preceding siblings ...)
2023-12-12 16:17 ` Eloitor
@ 2023-12-12 16:18 ` Eloitor
2023-12-12 16:21 ` Eloitor
` (7 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Eloitor @ 2023-12-12 16:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 886 bytes --]
There is an updated pull request by Eloitor against master on the void-packages repository
https://github.com/Eloitor/void-packages j
https://github.com/void-linux/void-packages/pull/47703
[WIP] j: update to 9.4.3.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
Currently build fails with
```
=> j-9.4.3_1: running post-install hook: 11-pkglint-elf-in-usrshare ...
=> ERROR: j-9.4.3_1: ELF files found in /usr/share:
=> ERROR: /usr/share/j/tools/regex/raspberry/j32/libjpcre2.so
=> ERROR: /usr/share/j/tools/regex/raspberry/j64/libjpcre2.so
=> ERROR: /usr/share/j/tools/regex/libjpcre2.so
=> ERROR: j-9.4.3_1: cannot continue with installation!
```
A patch file from https://github.com/void-linux/void-packages/pull/47703.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-j-47703.patch --]
[-- Type: text/x-diff, Size: 3189 bytes --]
From 9af5a9241d2583dd21a3ee6d9e4751ce130b5cf1 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@duck.com>
Date: Mon, 11 Dec 2023 22:32:29 +0100
Subject: [PATCH] j: update to 9.4.3.
---
srcpkgs/j/patches/fix-cip.c-includes.patch | 34 ----------------------
srcpkgs/j/template | 20 ++++++-------
2 files changed, 9 insertions(+), 45 deletions(-)
delete mode 100644 srcpkgs/j/patches/fix-cip.c-includes.patch
diff --git a/srcpkgs/j/patches/fix-cip.c-includes.patch b/srcpkgs/j/patches/fix-cip.c-includes.patch
deleted file mode 100644
index 7601d17006296..0000000000000
--- a/srcpkgs/j/patches/fix-cip.c-includes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/jsrc/cip.c 2020-01-30 13:31:22.463687182 +0900
-+++ b/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 95aa0710684dc..94c6f6a51644d 100644
--- a/srcpkgs/j/template
+++ b/srcpkgs/j/template
@@ -1,18 +1,16 @@
# Template file for 'j'
pkgname=j
-version=901.f
+reverts=901.f_1
+version=9.4.3
revision=1
-_vmaj="${version%.*}"
-_vmin="${version#${_vmaj}}"
-_vrel=${_vmaj}-release${_vmin:+-}${_vmin#.}
archs="aarch64* armv[67]* i686* x86_64*"
-makedepends="libedit-devel libgomp-devel"
+makedepends="libedit-devel libgomp-devel nasm"
short_desc="Modern, high-performance, ASCII-based successor to APL"
maintainer="B. Wilson <x@wilsonb.com>"
license="GPL-3.0-or-later"
homepage="https://jsoftware.com/"
-distfiles="https://github.com/jsoftware/jsource/archive/j${_vrel}.tar.gz"
-checksum=6b1cdcc1a0c3d955e400cf676f115de51ef9d1da495d08721ee999f48f6f9209
+distfiles="https://github.com/jsoftware/jsource/archive/refs/tags/${version}.tar.gz"
+checksum=55098a399e010bd8ae5e74523316959506ff69efa839098dddadd8960f6eaf55
_jsz="j${XBPS_TARGET_WORDSIZE}"
_jtype="release"
@@ -125,13 +123,13 @@ JC
}
do_install() {
- vmkdir "${_jshare}" 0755
- vcopy jlibrary/system "${_jshare}"
- vcopy jlibrary/tools "${_jshare}"
-
vmkdir "${_jlib}" 0755
vcopy "bin/${_jpl}/*" "${_jlib}"
+ vcopy jlibrary/system "${_jlib}"
+ vcopy jlibrary/tools "${_jlib}"
+ vcopy jlibrary/addons "${_jlib}"
+
vmkdir "${_jetc}" 0755
vinstall "${FILESDIR}/profilex_template.ijs" 644 "${_jetc}"
vinstall "jlibrary/bin/profile.ijs.new" 644 "${_jetc}" profile.ijs
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [WIP] j: update to 9.4.3.
2023-12-11 21:34 [PR PATCH] [WIP] j: update to 9.4.3 Eloitor
` (4 preceding siblings ...)
2023-12-12 16:18 ` Eloitor
@ 2023-12-12 16:21 ` Eloitor
2023-12-26 10:31 ` [PR PATCH] [Updated] " Eloitor
` (6 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Eloitor @ 2023-12-12 16:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 204 bytes --]
New comment by Eloitor on void-packages repository
https://github.com/void-linux/void-packages/pull/47703#issuecomment-1852368169
Comment:
Now it builds on my machine and works properly. (x86_64-glibc)
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] j: update to 9.4.3.
2023-12-11 21:34 [PR PATCH] [WIP] j: update to 9.4.3 Eloitor
` (5 preceding siblings ...)
2023-12-12 16:21 ` Eloitor
@ 2023-12-26 10:31 ` Eloitor
2023-12-26 11:04 ` Eloitor
` (5 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Eloitor @ 2023-12-26 10:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 886 bytes --]
There is an updated pull request by Eloitor against master on the void-packages repository
https://github.com/Eloitor/void-packages j
https://github.com/void-linux/void-packages/pull/47703
[WIP] j: update to 9.4.3.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
Currently build fails with
```
=> j-9.4.3_1: running post-install hook: 11-pkglint-elf-in-usrshare ...
=> ERROR: j-9.4.3_1: ELF files found in /usr/share:
=> ERROR: /usr/share/j/tools/regex/raspberry/j32/libjpcre2.so
=> ERROR: /usr/share/j/tools/regex/raspberry/j64/libjpcre2.so
=> ERROR: /usr/share/j/tools/regex/libjpcre2.so
=> ERROR: j-9.4.3_1: cannot continue with installation!
```
A patch file from https://github.com/void-linux/void-packages/pull/47703.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-j-47703.patch --]
[-- Type: text/x-diff, Size: 3189 bytes --]
From 9dce49cddb176172653a38c9a2a3f3e471412cc7 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@duck.com>
Date: Mon, 11 Dec 2023 22:32:29 +0100
Subject: [PATCH] j: update to 9.5.1.
---
srcpkgs/j/patches/fix-cip.c-includes.patch | 34 ----------------------
srcpkgs/j/template | 20 ++++++-------
2 files changed, 9 insertions(+), 45 deletions(-)
delete mode 100644 srcpkgs/j/patches/fix-cip.c-includes.patch
diff --git a/srcpkgs/j/patches/fix-cip.c-includes.patch b/srcpkgs/j/patches/fix-cip.c-includes.patch
deleted file mode 100644
index 7601d17006296..0000000000000
--- a/srcpkgs/j/patches/fix-cip.c-includes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/jsrc/cip.c 2020-01-30 13:31:22.463687182 +0900
-+++ b/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 95aa0710684dc..8b38ef07f5a1c 100644
--- a/srcpkgs/j/template
+++ b/srcpkgs/j/template
@@ -1,18 +1,16 @@
# Template file for 'j'
pkgname=j
-version=901.f
+reverts=901.f_1
+version=9.5.1
revision=1
-_vmaj="${version%.*}"
-_vmin="${version#${_vmaj}}"
-_vrel=${_vmaj}-release${_vmin:+-}${_vmin#.}
archs="aarch64* armv[67]* i686* x86_64*"
-makedepends="libedit-devel libgomp-devel"
+makedepends="libedit-devel libgomp-devel nasm"
short_desc="Modern, high-performance, ASCII-based successor to APL"
maintainer="B. Wilson <x@wilsonb.com>"
license="GPL-3.0-or-later"
homepage="https://jsoftware.com/"
-distfiles="https://github.com/jsoftware/jsource/archive/j${_vrel}.tar.gz"
-checksum=6b1cdcc1a0c3d955e400cf676f115de51ef9d1da495d08721ee999f48f6f9209
+distfiles="https://github.com/jsoftware/jsource/archive/refs/tags/${version}.tar.gz"
+checksum=593249894579af87b325833678dfe8a35c937fe344dcc954a0ad0e31f167497a
_jsz="j${XBPS_TARGET_WORDSIZE}"
_jtype="release"
@@ -125,13 +123,13 @@ JC
}
do_install() {
- vmkdir "${_jshare}" 0755
- vcopy jlibrary/system "${_jshare}"
- vcopy jlibrary/tools "${_jshare}"
-
vmkdir "${_jlib}" 0755
vcopy "bin/${_jpl}/*" "${_jlib}"
+ vcopy jlibrary/system "${_jlib}"
+ vcopy jlibrary/tools "${_jlib}"
+ vcopy jlibrary/addons "${_jlib}"
+
vmkdir "${_jetc}" 0755
vinstall "${FILESDIR}/profilex_template.ijs" 644 "${_jetc}"
vinstall "jlibrary/bin/profile.ijs.new" 644 "${_jetc}" profile.ijs
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [WIP] j: update to 9.4.3.
2023-12-11 21:34 [PR PATCH] [WIP] j: update to 9.4.3 Eloitor
` (6 preceding siblings ...)
2023-12-26 10:31 ` [PR PATCH] [Updated] " Eloitor
@ 2023-12-26 11:04 ` Eloitor
2024-01-11 14:22 ` [PR PATCH] [Updated] [WIP] j: update to 9.5.1 Eloitor
` (4 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Eloitor @ 2023-12-26 11:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 178 bytes --]
New comment by Eloitor on void-packages repository
https://github.com/void-linux/void-packages/pull/47703#issuecomment-1869461607
Comment:
j and jc conflict for
/usr/bin/jc
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] j: update to 9.5.1.
2023-12-11 21:34 [PR PATCH] [WIP] j: update to 9.4.3 Eloitor
` (7 preceding siblings ...)
2023-12-26 11:04 ` Eloitor
@ 2024-01-11 14:22 ` Eloitor
2024-01-11 14:34 ` Eloitor
` (3 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Eloitor @ 2024-01-11 14:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 886 bytes --]
There is an updated pull request by Eloitor against master on the void-packages repository
https://github.com/Eloitor/void-packages j
https://github.com/void-linux/void-packages/pull/47703
[WIP] j: update to 9.5.1.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
Currently build fails with
```
=> j-9.4.3_1: running post-install hook: 11-pkglint-elf-in-usrshare ...
=> ERROR: j-9.4.3_1: ELF files found in /usr/share:
=> ERROR: /usr/share/j/tools/regex/raspberry/j32/libjpcre2.so
=> ERROR: /usr/share/j/tools/regex/raspberry/j64/libjpcre2.so
=> ERROR: /usr/share/j/tools/regex/libjpcre2.so
=> ERROR: j-9.4.3_1: cannot continue with installation!
```
A patch file from https://github.com/void-linux/void-packages/pull/47703.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-j-47703.patch --]
[-- Type: text/x-diff, Size: 3284 bytes --]
From d48d65aa82f54364f92d4c83d29fac53342452d0 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@duck.com>
Date: Mon, 11 Dec 2023 22:32:29 +0100
Subject: [PATCH] j: update to 9.5.1.
---
srcpkgs/j/patches/fix-cip.c-includes.patch | 34 ----------------------
srcpkgs/j/template | 22 +++++++-------
2 files changed, 10 insertions(+), 46 deletions(-)
delete mode 100644 srcpkgs/j/patches/fix-cip.c-includes.patch
diff --git a/srcpkgs/j/patches/fix-cip.c-includes.patch b/srcpkgs/j/patches/fix-cip.c-includes.patch
deleted file mode 100644
index 7601d17006296..0000000000000
--- a/srcpkgs/j/patches/fix-cip.c-includes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/jsrc/cip.c 2020-01-30 13:31:22.463687182 +0900
-+++ b/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 95aa0710684dc..63ef4fd99009e 100644
--- a/srcpkgs/j/template
+++ b/srcpkgs/j/template
@@ -1,18 +1,16 @@
# Template file for 'j'
pkgname=j
-version=901.f
+reverts=901.f_1
+version=9.5.1
revision=1
-_vmaj="${version%.*}"
-_vmin="${version#${_vmaj}}"
-_vrel=${_vmaj}-release${_vmin:+-}${_vmin#.}
archs="aarch64* armv[67]* i686* x86_64*"
-makedepends="libedit-devel libgomp-devel"
+makedepends="libedit-devel libgomp-devel nasm"
short_desc="Modern, high-performance, ASCII-based successor to APL"
maintainer="B. Wilson <x@wilsonb.com>"
license="GPL-3.0-or-later"
homepage="https://jsoftware.com/"
-distfiles="https://github.com/jsoftware/jsource/archive/j${_vrel}.tar.gz"
-checksum=6b1cdcc1a0c3d955e400cf676f115de51ef9d1da495d08721ee999f48f6f9209
+distfiles="https://github.com/jsoftware/jsource/archive/refs/tags/${version}.tar.gz"
+checksum=593249894579af87b325833678dfe8a35c937fe344dcc954a0ad0e31f167497a
_jsz="j${XBPS_TARGET_WORDSIZE}"
_jtype="release"
@@ -125,17 +123,17 @@ JC
}
do_install() {
- vmkdir "${_jshare}" 0755
- vcopy jlibrary/system "${_jshare}"
- vcopy jlibrary/tools "${_jshare}"
-
vmkdir "${_jlib}" 0755
vcopy "bin/${_jpl}/*" "${_jlib}"
+ vcopy jlibrary/system "${_jlib}"
+ vcopy jlibrary/tools "${_jlib}"
+ vcopy jlibrary/addons "${_jlib}"
+
vmkdir "${_jetc}" 0755
vinstall "${FILESDIR}/profilex_template.ijs" 644 "${_jetc}"
vinstall "jlibrary/bin/profile.ijs.new" 644 "${_jetc}" profile.ijs
_jconsole_wrapper_script >bin/jc.sh
- vbin "bin/jc.sh" jc
+ vbin "bin/jc.sh" jconsole
}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] j: update to 9.5.1.
2023-12-11 21:34 [PR PATCH] [WIP] j: update to 9.4.3 Eloitor
` (8 preceding siblings ...)
2024-01-11 14:22 ` [PR PATCH] [Updated] [WIP] j: update to 9.5.1 Eloitor
@ 2024-01-11 14:34 ` Eloitor
2024-01-11 14:59 ` Eloitor
` (2 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Eloitor @ 2024-01-11 14:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 886 bytes --]
There is an updated pull request by Eloitor against master on the void-packages repository
https://github.com/Eloitor/void-packages j
https://github.com/void-linux/void-packages/pull/47703
[WIP] j: update to 9.5.1.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
Currently build fails with
```
=> j-9.4.3_1: running post-install hook: 11-pkglint-elf-in-usrshare ...
=> ERROR: j-9.4.3_1: ELF files found in /usr/share:
=> ERROR: /usr/share/j/tools/regex/raspberry/j32/libjpcre2.so
=> ERROR: /usr/share/j/tools/regex/raspberry/j64/libjpcre2.so
=> ERROR: /usr/share/j/tools/regex/libjpcre2.so
=> ERROR: j-9.4.3_1: cannot continue with installation!
```
A patch file from https://github.com/void-linux/void-packages/pull/47703.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-j-47703.patch --]
[-- Type: text/x-diff, Size: 3285 bytes --]
From 92b2030f41f2b86f1f95155323afc3b19a8be25a Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@duck.com>
Date: Mon, 11 Dec 2023 22:32:29 +0100
Subject: [PATCH] j: update to 9.5.1.
---
srcpkgs/j/patches/fix-cip.c-includes.patch | 34 ----------------------
srcpkgs/j/template | 22 +++++++-------
2 files changed, 10 insertions(+), 46 deletions(-)
delete mode 100644 srcpkgs/j/patches/fix-cip.c-includes.patch
diff --git a/srcpkgs/j/patches/fix-cip.c-includes.patch b/srcpkgs/j/patches/fix-cip.c-includes.patch
deleted file mode 100644
index 7601d17006296..0000000000000
--- a/srcpkgs/j/patches/fix-cip.c-includes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/jsrc/cip.c 2020-01-30 13:31:22.463687182 +0900
-+++ b/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 95aa0710684dc..dc3428a4dd841 100644
--- a/srcpkgs/j/template
+++ b/srcpkgs/j/template
@@ -1,18 +1,16 @@
# Template file for 'j'
pkgname=j
-version=901.f
+reverts=901.f_1
+version=9.5.1
revision=1
-_vmaj="${version%.*}"
-_vmin="${version#${_vmaj}}"
-_vrel=${_vmaj}-release${_vmin:+-}${_vmin#.}
archs="aarch64* armv[67]* i686* x86_64*"
-makedepends="libedit-devel libgomp-devel"
+makedepends="libedit-devel libgomp-devel nasm"
short_desc="Modern, high-performance, ASCII-based successor to APL"
maintainer="B. Wilson <x@wilsonb.com>"
license="GPL-3.0-or-later"
homepage="https://jsoftware.com/"
-distfiles="https://github.com/jsoftware/jsource/archive/j${_vrel}.tar.gz"
-checksum=6b1cdcc1a0c3d955e400cf676f115de51ef9d1da495d08721ee999f48f6f9209
+distfiles="https://github.com/jsoftware/jsource/archive/refs/tags/${version}.tar.gz"
+checksum=593249894579af87b325833678dfe8a35c937fe344dcc954a0ad0e31f167497a
_jsz="j${XBPS_TARGET_WORDSIZE}"
_jtype="release"
@@ -125,17 +123,17 @@ JC
}
do_install() {
- vmkdir "${_jshare}" 0755
- vcopy jlibrary/system "${_jshare}"
- vcopy jlibrary/tools "${_jshare}"
-
vmkdir "${_jlib}" 0755
vcopy "bin/${_jpl}/*" "${_jlib}"
+ vcopy jlibrary/system "${_jlib}"
+ vcopy jlibrary/tools "${_jlib}"
+ vcopy jlibrary/addons "${_jlib}"
+
vmkdir "${_jetc}" 0755
vinstall "${FILESDIR}/profilex_template.ijs" 644 "${_jetc}"
vinstall "jlibrary/bin/profile.ijs.new" 644 "${_jetc}" profile.ijs
_jconsole_wrapper_script >bin/jc.sh
- vbin "bin/jc.sh" jc
+ vbin "bin/jc.sh" ijconsole
}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [WIP] j: update to 9.5.1.
2023-12-11 21:34 [PR PATCH] [WIP] j: update to 9.4.3 Eloitor
` (9 preceding siblings ...)
2024-01-11 14:34 ` Eloitor
@ 2024-01-11 14:59 ` Eloitor
2024-03-06 9:53 ` [PR PATCH] [Closed]: " Eloitor
2024-03-06 9:53 ` Eloitor
12 siblings, 0 replies; 14+ messages in thread
From: Eloitor @ 2024-01-11 14:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 297 bytes --]
New comment by Eloitor on void-packages repository
https://github.com/void-linux/void-packages/pull/47703#issuecomment-1887362972
Comment:
/usr/bin/aarch64-linux-gnu-strip: Unable to recognise the format of the input file `/destdir/aarch64-linux-gnu/j-9.5.1/usr/lib/j/tools/regex/libjpcre2.so'
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Closed]: [WIP] j: update to 9.5.1.
2023-12-11 21:34 [PR PATCH] [WIP] j: update to 9.4.3 Eloitor
` (10 preceding siblings ...)
2024-01-11 14:59 ` Eloitor
@ 2024-03-06 9:53 ` Eloitor
2024-03-06 9:53 ` Eloitor
12 siblings, 0 replies; 14+ messages in thread
From: Eloitor @ 2024-03-06 9:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 736 bytes --]
There's a closed pull request on the void-packages repository
[WIP] j: update to 9.5.1.
https://github.com/void-linux/void-packages/pull/47703
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
Currently build fails with
```
=> j-9.4.3_1: running post-install hook: 11-pkglint-elf-in-usrshare ...
=> ERROR: j-9.4.3_1: ELF files found in /usr/share:
=> ERROR: /usr/share/j/tools/regex/raspberry/j32/libjpcre2.so
=> ERROR: /usr/share/j/tools/regex/raspberry/j64/libjpcre2.so
=> ERROR: /usr/share/j/tools/regex/libjpcre2.so
=> ERROR: j-9.4.3_1: cannot continue with installation!
```
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [WIP] j: update to 9.5.1.
2023-12-11 21:34 [PR PATCH] [WIP] j: update to 9.4.3 Eloitor
` (11 preceding siblings ...)
2024-03-06 9:53 ` [PR PATCH] [Closed]: " Eloitor
@ 2024-03-06 9:53 ` Eloitor
12 siblings, 0 replies; 14+ messages in thread
From: Eloitor @ 2024-03-06 9:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 244 bytes --]
New comment by Eloitor on void-packages repository
https://github.com/void-linux/void-packages/pull/47703#issuecomment-1980485247
Comment:
Updated at https://github.com/void-linux/void-packages/commit/c3374b2b3d09a1f22634d06149d066e34f72e3ee
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2024-03-06 9:53 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-11 21:34 [PR PATCH] [WIP] j: update to 9.4.3 Eloitor
2023-12-12 14:00 ` [PR PATCH] [Updated] " Eloitor
2023-12-12 15:52 ` Eloitor
2023-12-12 16:16 ` Eloitor
2023-12-12 16:17 ` Eloitor
2023-12-12 16:18 ` Eloitor
2023-12-12 16:21 ` Eloitor
2023-12-26 10:31 ` [PR PATCH] [Updated] " Eloitor
2023-12-26 11:04 ` Eloitor
2024-01-11 14:22 ` [PR PATCH] [Updated] [WIP] j: update to 9.5.1 Eloitor
2024-01-11 14:34 ` Eloitor
2024-01-11 14:59 ` Eloitor
2024-03-06 9:53 ` [PR PATCH] [Closed]: " Eloitor
2024-03-06 9:53 ` Eloitor
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).