mirror of
https://git.freebsd.org/ports.git
synced 2025-06-07 05:40:30 -04:00
lang/J: Update to j807-release
PR: 236454 Submitted by: João Neves <sevenjp@gmail.com> (maintainer)
This commit is contained in:
parent
712ddf1cad
commit
7cf0b81f43
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=500311
17 changed files with 186 additions and 131 deletions
|
@ -1,25 +1,24 @@
|
||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
PORTNAME= J
|
PORTNAME= J
|
||||||
DISTVERSIONPREFIX= j
|
PORTVERSION= ${JVERSION:S/^j//:S/-release//}
|
||||||
DISTVERSION= 808
|
PORTEPOCH= 1
|
||||||
DISTVERSIONSUFFIX= -release
|
|
||||||
CATEGORIES= lang math
|
CATEGORIES= lang math
|
||||||
|
|
||||||
MAINTAINER= sevenjp@gmail.com
|
MAINTAINER= sevenjp@gmail.com
|
||||||
COMMENT= J programming language
|
COMMENT= J programming language
|
||||||
|
|
||||||
LICENSE= GPLv3
|
LICENSE= GPLv3
|
||||||
LICENSE_FILE= ${WRKSRC}/license.txt
|
LICENSE_FILE= ${WRKDIR}/jsource-${JVERSION}/license.txt
|
||||||
|
|
||||||
ONLY_FOR_ARCHS= amd64
|
ONLY_FOR_ARCHS_REASON_amd64= Not built or tested for other archs. i386 needs hostdefs and netdefs files to be generated.
|
||||||
ONLY_FOR_ARCHS_REASON_i386= i386 needs hostdefs and netdefs files to be generated.
|
|
||||||
|
|
||||||
BUILD_DEPENDS= bash:shells/bash
|
BUILD_DEPENDS= bash:shells/bash
|
||||||
LIB_DEPENDS= libpcreposix.so:devel/pcre \
|
LIB_DEPENDS= libpcre2-8.so:devel/pcre2 \
|
||||||
libsqlite3.so:databases/sqlite3
|
libsqlite3.so:databases/sqlite3
|
||||||
|
|
||||||
USES+= libedit gmake shebangfix uidfix
|
USES+= libedit gmake shebangfix uidfix
|
||||||
|
|
||||||
SHEBANG_GLOB= *.sh
|
SHEBANG_GLOB= *.sh
|
||||||
|
|
||||||
SUB_FILES= jconsole profile.ijs
|
SUB_FILES= jconsole profile.ijs
|
||||||
|
@ -27,10 +26,29 @@ SUB_FILES= jconsole profile.ijs
|
||||||
USE_GITHUB= yes
|
USE_GITHUB= yes
|
||||||
GH_ACCOUNT= jsoftware
|
GH_ACCOUNT= jsoftware
|
||||||
GH_PROJECT= jsource
|
GH_PROJECT= jsource
|
||||||
|
GH_TAGNAME= ${JVERSION}
|
||||||
|
|
||||||
|
# J is released with ports-unfriendly versioning
|
||||||
|
JVERSION= j807-release
|
||||||
|
|
||||||
BIN_FILES= jconsole
|
BIN_FILES= jconsole
|
||||||
LIB_FILES= libj.so libtsdll.so
|
LIB_FILES= libj.so libtsdll.so
|
||||||
|
|
||||||
|
OPTIONS_DEFINE= OPENMP
|
||||||
|
|
||||||
|
OPENMP_DESC= Build with OpenMP support
|
||||||
|
OPENMP_USES= compiler:openmp
|
||||||
|
OPENMP_MAKE_ENV= USE_OPENMP=1
|
||||||
|
OPENMP_LIB_DEPENDS= libgomp.so:lang/gcc7
|
||||||
|
|
||||||
|
# J wants to install jconsole, also provided by openjdk
|
||||||
|
CONFLICTS_INSTALL= openjdk6 \
|
||||||
|
openjdk6-jre \
|
||||||
|
openjdk7 \
|
||||||
|
openjdk7-jre \
|
||||||
|
openjdk8 \
|
||||||
|
openjdk8-jre
|
||||||
|
|
||||||
do-install:
|
do-install:
|
||||||
${MKDIR} ${STAGEDIR}${PREFIX}/lib/j/bin
|
${MKDIR} ${STAGEDIR}${PREFIX}/lib/j/bin
|
||||||
${MKDIR} ${STAGEDIR}${PREFIX}/share/j/system
|
${MKDIR} ${STAGEDIR}${PREFIX}/share/j/system
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
TIMESTAMP = 1528123249
|
TIMESTAMP = 1546772563
|
||||||
SHA256 (jsoftware-jsource-j808-release_GH0.tar.gz) = 1c7335e0d705bfc630da230ee8d196487627eed6f9374728bcac6b9ffbb1fd1d
|
SHA256 (jsoftware-jsource-807-j807-release_GH0.tar.gz) = 324ff0b046c9f7f24f18a72fa8a4253ad54c99a48c397fd2c724392f5e097d7f
|
||||||
SIZE (jsoftware-jsource-j808-release_GH0.tar.gz) = 2128876
|
SIZE (jsoftware-jsource-807-j807-release_GH0.tar.gz) = 2398318
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# $FreeBSD$
|
|
||||||
|
|
||||||
exec %%LOCALBASE%%/lib/j/bin/jconsole -jprofile %%LOCALBASE%%/share/j/profile.ijs
|
exec %%LOCALBASE%%/lib/j/bin/jconsole -jprofile %%LOCALBASE%%/share/j/profile.ijs
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- Makefile.orig 2018-04-09 18:07:38 UTC
|
--- Makefile.orig 2018-04-09 18:07:38 UTC
|
||||||
+++ Makefile
|
+++ Makefile
|
||||||
@@ -0,0 +1,21 @@
|
@@ -0,0 +1,18 @@
|
||||||
+.PHONY: all
|
+.PHONY: all
|
||||||
+all: make-${ARCH}
|
+all: make-${ARCH}
|
||||||
+
|
+
|
||||||
|
@ -10,11 +10,8 @@
|
||||||
+.PHONY: make-i386
|
+.PHONY: make-i386
|
||||||
+make-i386: build-j32
|
+make-i386: build-j32
|
||||||
+
|
+
|
||||||
+.PHONY: init
|
+build-%:
|
||||||
+init:
|
|
||||||
+ make/install.sh
|
+ make/install.sh
|
||||||
+
|
|
||||||
+build-%: init
|
|
||||||
+ make/build_jconsole.sh $*
|
+ make/build_jconsole.sh $*
|
||||||
+ make/build_libj.sh $*
|
+ make/build_libj.sh $*
|
||||||
+ make/build_tsdll.sh $*
|
+ make/build_tsdll.sh $*
|
||||||
|
|
|
@ -1,21 +1,21 @@
|
||||||
--- jlibrary/system/config/base.cfg.orig 2016-11-25 19:04:24 UTC
|
--- jlibrary/system/config/base.cfg.orig 2019-01-06 11:06:00 UTC
|
||||||
+++ jlibrary/system/config/base.cfg
|
+++ jlibrary/system/config/base.cfg
|
||||||
@@ -93,6 +93,18 @@ case. 'Linux' do.
|
@@ -90,6 +90,18 @@ case. 'Linux' do.
|
||||||
XDiff=: '/usr/bin/meld'
|
XDiff=: ''
|
||||||
Editor=: 'geany +%l %f'
|
Editor=: ''
|
||||||
Editor_nox=: 'vi -c%l %f'
|
Editor_nox=: ''
|
||||||
+case. 'FreeBSD' do.
|
+case. 'FreeBSD' do.
|
||||||
+ BoxForm=: 0
|
+ BoxForm=: 0
|
||||||
+ Browser=: ''
|
+ Browser=: ''
|
||||||
+ Browser_nox=: '/usr/bin/w3m'
|
+ Browser_nox=: ''
|
||||||
+ EPSReader=: '/usr/bin/evince'
|
+ EPSReader=: ''
|
||||||
+ ImageViewer=: ''
|
+ ImageViewer=: ''
|
||||||
+ ImageViewer_nox=: ''
|
+ ImageViewer_nox=: ''
|
||||||
+ PDFReader=: '/usr/bin/evince'
|
+ PDFReader=: ''
|
||||||
+ PDFReader_nox=: ''
|
+ PDFReader_nox=: ''
|
||||||
+ XDiff=: '/usr/bin/meld'
|
+ XDiff=: ''
|
||||||
+ Editor=: 'geany +%l %f'
|
+ Editor=: ''
|
||||||
+ Editor_nox=: 'vi -c%l %f'
|
+ Editor_nox=: ''
|
||||||
case. 'Win' do.
|
case. 'Win' do.
|
||||||
BoxForm=: 1
|
BoxForm=: 1
|
||||||
Browser=: ''
|
Browser=: ''
|
||||||
|
|
|
@ -1,10 +1,19 @@
|
||||||
--- jlibrary/system/main/regex.ijs.orig 2018-03-07 18:59:01 UTC
|
--- jlibrary/system/main/regex.ijs.orig 2019-01-06 11:11:14 UTC
|
||||||
+++ jlibrary/system/main/regex.ijs
|
+++ jlibrary/system/main/regex.ijs
|
||||||
@@ -101,6 +101,7 @@ NB. rxdll is in bin or tools/regex
|
@@ -179,6 +179,7 @@ select. UNAME
|
||||||
select. UNAME
|
case. 'Win' do. t=. 'jpcre2.dll'
|
||||||
case. 'Win' do. t=. 'jpcre.dll'
|
case. 'Darwin' do. t=. 'libjpcre2.dylib'
|
||||||
case. 'Darwin' do. t=. 'libjpcre.dylib'
|
case. 'Linux' do. t=. 'libjpcre2.so'
|
||||||
+case. 'FreeBSD' do. t=. 'libpcreposix.so'
|
+case. 'FreeBSD' do. t=. 'libjpcre2.so'
|
||||||
fcase. 'Linux' do.
|
case. 'Android' do. t=. 'libjpcre2.so'
|
||||||
if. 2 0-:('libpcreposix.so.3 dummyfunction n')&(15!:0) ::(15!:10) '' do.
|
end.
|
||||||
rxdll=: 'libpcreposix.so.3'
|
|
||||||
|
@@ -191,6 +192,8 @@ NB. fall back one more time
|
||||||
|
if. ('Android'-:UNAME) *. 0 = 1!:4 :: 0: <f do.
|
||||||
|
f=. (({.~i:&'/')LIBFILE),'/',t
|
||||||
|
elseif. ('Linux'-:UNAME) *. (IFUNIX>'/'e.LIBFILE) *. 0 = 1!:4 :: 0: <f do.
|
||||||
|
+ f=. 'libpcre2-8.so.0'
|
||||||
|
+elseif. ('FreeBSD'-:UNAME) *. (IFUNIX>'/'e.LIBFILE) *. 0 = 1!:4 :: 0: <f do.
|
||||||
|
f=. 'libpcre2-8.so.0'
|
||||||
|
elseif. 0 = 1!:4 :: 0: <f do.
|
||||||
|
f=. t
|
||||||
|
|
|
@ -1,6 +1,14 @@
|
||||||
--- jlibrary/system/main/stdlib.ijs.orig 2016-11-25 19:04:24 UTC
|
--- jlibrary/system/main/stdlib.ijs.orig 2018-10-02 13:24:06 UTC
|
||||||
+++ jlibrary/system/main/stdlib.ijs
|
+++ jlibrary/system/main/stdlib.ijs
|
||||||
@@ -93,6 +93,7 @@ if. (<'home') -.@e. {."1 SystemFolders d
|
@@ -44,6 +44,7 @@ if. notdef 'FHS' do.
|
||||||
|
FHS=: IFUNIX>'/'e.LIBFILE
|
||||||
|
end.
|
||||||
|
'libc.so.6 setlocale > x i *c'&(15!:0)^:(UNAME-:'Linux') 1;,'C'
|
||||||
|
+'libc.so.7 setlocale > x i *c'&(15!:0)^:(UNAME-:'FreeBSD') 1;,'C'
|
||||||
|
if. notdef 'IFRASPI' do.
|
||||||
|
if. UNAME -: 'Linux' do.
|
||||||
|
cpu=. 2!:0 'cat /proc/cpuinfo'
|
||||||
|
@@ -106,6 +107,7 @@ if. (<'home') -.@e. {."1 SystemFolders do.
|
||||||
elseif. 'Android'-:UNAME do. t=. '/sdcard'
|
elseif. 'Android'-:UNAME do. t=. '/sdcard'
|
||||||
elseif. 'Darwin'-:UNAME do. t=. (0-:t){::'';~t=. 2!:5'HOME'
|
elseif. 'Darwin'-:UNAME do. t=. (0-:t){::'';~t=. 2!:5'HOME'
|
||||||
elseif. 'Linux'-:UNAME do. t=. (0-:t){::'';~t=. 2!:5'HOME'
|
elseif. 'Linux'-:UNAME do. t=. (0-:t){::'';~t=. 2!:5'HOME'
|
||||||
|
@ -8,7 +16,7 @@
|
||||||
elseif. do. t=. ''
|
elseif. do. t=. ''
|
||||||
end.
|
end.
|
||||||
if. (''-:t)+.((,'/')-:t)+.('/root'-:t)+.('/usr/'-:5{.t) do.
|
if. (''-:t)+.((,'/')-:t)+.('/root'-:t)+.('/usr/'-:5{.t) do.
|
||||||
@@ -107,6 +108,7 @@ if. (<'temp') -.@e. {."1 SystemFolders d
|
@@ -120,6 +122,7 @@ if. (<'temp') -.@e. {."1 SystemFolders do.
|
||||||
elseif. 'Android'-:UNAME do. t=. '/sdcard'
|
elseif. 'Android'-:UNAME do. t=. '/sdcard'
|
||||||
elseif. 'Darwin'-:UNAME do. 1!:5 ::] <t=. '/tmp/',":2!:6''
|
elseif. 'Darwin'-:UNAME do. 1!:5 ::] <t=. '/tmp/',":2!:6''
|
||||||
elseif. 'Linux'-:UNAME do. 1!:5 ::] <t=. '/tmp/',":2!:6''
|
elseif. 'Linux'-:UNAME do. 1!:5 ::] <t=. '/tmp/',":2!:6''
|
||||||
|
@ -16,7 +24,7 @@
|
||||||
elseif. do. t=. ''
|
elseif. do. t=. ''
|
||||||
end.
|
end.
|
||||||
SystemFolders=: SystemFolders, 'temp';t
|
SystemFolders=: SystemFolders, 'temp';t
|
||||||
@@ -119,14 +121,14 @@ end.
|
@@ -132,14 +135,14 @@ end.
|
||||||
18!:4 <'z'
|
18!:4 <'z'
|
||||||
18!:4 <'z'
|
18!:4 <'z'
|
||||||
UNXLIB=: ([: <;._1 ' ',]);._2 (0 : 0)
|
UNXLIB=: ([: <;._1 ' ',]);._2 (0 : 0)
|
||||||
|
@ -36,7 +44,7 @@
|
||||||
(<r,c) {:: UNXLIB_z_
|
(<r,c) {:: UNXLIB_z_
|
||||||
)
|
)
|
||||||
18!:4 <'z'
|
18!:4 <'z'
|
||||||
@@ -1337,7 +1339,7 @@ require 'pacman'
|
@@ -1343,7 +1346,7 @@ require 'pacman'
|
||||||
do_install_jpacman_ y
|
do_install_jpacman_ y
|
||||||
)
|
)
|
||||||
getqtbin=: 3 : 0
|
getqtbin=: 3 : 0
|
||||||
|
|
11
lang/J/files/patch-jsrc_jeload.c
Normal file
11
lang/J/files/patch-jsrc_jeload.c
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
--- jsrc/jeload.c.orig 2019-03-10 11:13:19 UTC
|
||||||
|
+++ jsrc/jeload.c
|
||||||
|
@@ -330,6 +330,8 @@ int jefirst(int type,char* arg)
|
||||||
|
strcat(input,"[UNAME_z_=:'Win'");
|
||||||
|
#elif defined(__MACH__)
|
||||||
|
strcat(input,"[UNAME_z_=:'Darwin'");
|
||||||
|
+#elif defined(__FreeBSD__)
|
||||||
|
+ strcat(input,"[UNAME_z_=:'FreeBSD'");
|
||||||
|
#elif !defined(ANDROID)
|
||||||
|
strcat(input,"[UNAME_z_=:'Linux'");
|
||||||
|
#endif
|
|
@ -1,21 +1,18 @@
|
||||||
--- make/build_jconsole.sh.orig 2018-04-09 17:54:22 UTC
|
--- make/build_jconsole.sh.orig 2019-01-06 17:19:19 UTC
|
||||||
+++ make/build_jconsole.sh
|
+++ make/build_jconsole.sh
|
||||||
@@ -1,9 +1,8 @@
|
@@ -1,6 +1,6 @@
|
||||||
#!/usr/local/bin/bash
|
#!/usr/local/bin/bash
|
||||||
# $1 is j32 or j64
|
# $1 is j32 or j64
|
||||||
-cd ~
|
-cd ~
|
||||||
-. jvars.sh
|
|
||||||
+. make/jvars.sh
|
+. make/jvars.sh
|
||||||
|
|
||||||
-common=" -fPIC -O1 -Wextra "
|
common=" -fPIC -O1 -Wextra -Wno-unused-parameter "
|
||||||
+common=" -fPIC -Wextra "
|
|
||||||
|
|
||||||
case $jplatform\_$1 in
|
@@ -29,6 +29,14 @@ LINK=" -ledit -ldl -lncurses -m32 -mmacosx-version-min
|
||||||
|
darwin_j64)
|
||||||
@@ -27,6 +26,14 @@ darwin_j64)
|
|
||||||
COMPILE="$common -DREADLINE -mmacosx-version-min=10.5"
|
COMPILE="$common -DREADLINE -mmacosx-version-min=10.5"
|
||||||
LINK=" -ledit -ldl -lncurses -mmacosx-version-min=10.5 -o jconsole "
|
LINK=" -ledit -ldl -lncurses -mmacosx-version-min=10.5 -o jconsole "
|
||||||
;;
|
+;;
|
||||||
+freebsd_j32)
|
+freebsd_j32)
|
||||||
+COMPILE="$common -m32 -DREADLINE"
|
+COMPILE="$common -m32 -DREADLINE"
|
||||||
+LINK="-L${LOCALBASE}/lib -ledit -m32 -o jconsole "
|
+LINK="-L${LOCALBASE}/lib -ledit -m32 -o jconsole "
|
||||||
|
@ -23,7 +20,6 @@
|
||||||
+freebsd_j64)
|
+freebsd_j64)
|
||||||
+COMPILE="$common -DREADLINE"
|
+COMPILE="$common -DREADLINE"
|
||||||
+LINK="-L${LOCALBASE}/lib -ledit -o jconsole "
|
+LINK="-L${LOCALBASE}/lib -ledit -o jconsole "
|
||||||
+;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo no case for those parameters
|
echo no case for those parameters
|
||||||
exit
|
|
||||||
|
|
|
@ -1,42 +1,42 @@
|
||||||
--- make/build_libj.sh.orig 2018-04-09 18:12:26 UTC
|
--- make/build_libj.sh.orig 2019-03-10 15:39:26 UTC
|
||||||
+++ make/build_libj.sh
|
+++ make/build_libj.sh
|
||||||
@@ -1,7 +1,6 @@
|
@@ -1,6 +1,6 @@
|
||||||
#!/usr/local/bin/bash
|
#!/usr/local/bin/bash
|
||||||
# $1 is j32 or j64
|
# $1 is j32 or j64
|
||||||
-cd ~
|
-cd ~
|
||||||
-. jvars.sh
|
|
||||||
+. make/jvars.sh
|
+. make/jvars.sh
|
||||||
|
|
||||||
# gcc 5 vs 4 - killing off linux asm routines (overflow detection)
|
# gcc 5 vs 4 - killing off linux asm routines (overflow detection)
|
||||||
# new fast code uses builtins not available in gcc 4
|
# new fast code uses builtins not available in gcc 4
|
||||||
@@ -15,6 +14,8 @@ common="-fPIC -O1 -fno-if-conversion2 -f
|
@@ -14,7 +14,7 @@ if [ $USE_OPENMP -eq 1 ] ; then
|
||||||
# clang
|
OPENMP=" -fopenmp "
|
||||||
# common="-Werror -fPIC -O1 -fwrapv -fno-strict-aliasing -Wextra -Wno-clobbered -Wno-maybe-uninitialized -Wno-unused-parameter -Wno-sign-compare -Wno-empty-body -Wno-unused-value -Wno-pointer-sign -Wno-parentheses -Wno-unsequenced -Wno-string-plus-int"
|
LDOPENMP=" -fopenmp "
|
||||||
darwin="-fPIC -O1 -fwrapv -fno-strict-aliasing -Wno-string-plus-int -Wno-empty-body -Wno-unsequenced -Wno-unused-value -Wno-pointer-sign -Wno-parentheses -Wno-return-type -Wno-constant-logical-operand -Wno-comment -Wno-unsequenced"
|
if [ "x$compiler" = x'gcc' ] ; then
|
||||||
+freebsd="-fPIC -O1 -fwrapv -fno-strict-aliasing -Wno-string-plus-int -Wno-empty-body -Wno-unsequenced -Wno-unused-value -Wno-pointer-sign -Wno-parentheses -Wno-return-type -Wno-constant-logical-operand -Wno-comment -Wno-unsequenced"
|
-LDOPENMP32=" -l:libgomp.so.1 " # gcc
|
||||||
+
|
+LDOPENMP32=" -l:libgomp.so " # gcc
|
||||||
|
else
|
||||||
case $jplatform\_$1 in
|
LDOPENMP32=" -l:libomp.so.5 " # clang
|
||||||
|
fi
|
||||||
@@ -50,6 +51,21 @@ TARGET=libj.dylib
|
@@ -92,6 +92,22 @@ TARGET=libj.dylib
|
||||||
COMPILE="$darwin -mmacosx-version-min=10.5"
|
COMPILE="$darwin -mavx -mmacosx-version-min=10.5 -DC_AVX=1"
|
||||||
LINK=" -dynamiclib -lm -ldl -mmacosx-version-min=10.5 -o libj.dylib"
|
LINK=" -dynamiclib -lm -ldl $LDOPENMP -mmacosx-version-min=10.5 -o libj.dylib"
|
||||||
;;
|
OBJS_FMA=" blis/gemm_int-fma.o "
|
||||||
|
+;;
|
||||||
+
|
+
|
||||||
+freebsd_j32) # freebsd x86
|
+freebsd_j32) # freebsd x86
|
||||||
+TARGET=libj.so
|
+TARGET=libj.so
|
||||||
+# faster, but sse2 not available for 32-bit amd cpu
|
+# faster, but sse2 not available for 32-bit amd cpu
|
||||||
+# sse does not support mfpmath=sse in 32-bit gcc
|
+# sse does not support mfpmath=sse in 32-bit gcc
|
||||||
+COMPILE="$freebsd -m32 -msse2 -mfpmath=sse -DC_NOMULTINTRINSIC "
|
+COMPILE="$common -m32 -msse2 -mfpmath=sse -DC_NOMULTINTRINSIC "
|
||||||
+# slower, use 387 fpu and truncate extra precision
|
+# slower, use 387 fpu and truncate extra precision
|
||||||
+# COMPILE="$freebsd -m32 -ffloat-store "
|
+# COMPILE="$common -m32 -ffloat-store "
|
||||||
+LINK=" -shared -Wl,-soname,libj.so -m32 -lm -o libj.so "
|
+LINK=" -shared -Wl,-soname,libj.so -m32 -lm -ldl $LDOPENMP32 -o libj.so "
|
||||||
+;;
|
+;;
|
||||||
+freebsd_j64) # freebsd x86
|
+
|
||||||
|
+freebsd_j64) # freebsd amd64
|
||||||
+TARGET=libj.so
|
+TARGET=libj.so
|
||||||
+COMPILE="$freebsd -DC_NOMULTINTRINSIC "
|
+COMPILE="$common -DC_NOMULTINTRINSIC "
|
||||||
+LINK=" -shared -Wl,-soname,libj.so -lm -o libj.so "
|
+LINK=" -shared -Wl,-soname,libj.so -lm -ldl $LDOPENMP -o libj.so "
|
||||||
+;;
|
;;
|
||||||
|
|
||||||
*)
|
*)
|
||||||
echo no case for those parameters
|
|
||||||
exit
|
|
||||||
|
|
|
@ -1,21 +1,34 @@
|
||||||
--- make/build_tsdll.sh.orig 2018-04-09 18:00:06 UTC
|
--- make/build_tsdll.sh.orig 2019-03-10 15:32:23 UTC
|
||||||
+++ make/build_tsdll.sh
|
+++ make/build_tsdll.sh
|
||||||
@@ -1,9 +1,8 @@
|
@@ -1,9 +1,22 @@
|
||||||
#!/usr/local/bin/bash
|
#!/usr/local/bin/bash
|
||||||
# $1 is j32 or j64
|
# $1 is j32 or j64
|
||||||
-cd ~
|
-cd ~
|
||||||
-. jvars.sh
|
|
||||||
+. make/jvars.sh
|
+. make/jvars.sh
|
||||||
|
|
||||||
-common=" -fPIC -O1 -Werror -Wextra -Wno-unused-parameter"
|
+compiler=${CC:0:3}
|
||||||
+common=" -fPIC -Werror -Wextra -Wno-unused-parameter"
|
+
|
||||||
|
common=" -fPIC -O1 -Werror -Wextra -Wno-unused-parameter"
|
||||||
|
|
||||||
|
+if [ "x$compiler" = x'gcc' ] ; then
|
||||||
|
+OVER_GCC_VER7=$(echo `$CC -dumpversion | cut -f1 -d.` \>= 7 | bc)
|
||||||
|
+if [ $OVER_GCC_VER7 -eq 1 ] ; then
|
||||||
|
+common="$common -Wno-implicit-fallthrough"
|
||||||
|
+fi
|
||||||
|
+OVER_GCC_VER8=$(echo `$CC -dumpversion | cut -f1 -d.` \>= 8 | bc)
|
||||||
|
+if [ $OVER_GCC_VER8 -eq 1 ] ; then
|
||||||
|
+common="$common -Wno-cast-function-type"
|
||||||
|
+fi
|
||||||
|
+fi
|
||||||
|
+
|
||||||
case $jplatform\_$1 in
|
case $jplatform\_$1 in
|
||||||
|
|
||||||
@@ -33,6 +32,16 @@ TARGET=libtsdll.dylib
|
linux_j32)
|
||||||
|
@@ -35,6 +48,16 @@ darwin_j64)
|
||||||
|
TARGET=libtsdll.dylib
|
||||||
COMPILE="$common "
|
COMPILE="$common "
|
||||||
LINK=" -dynamiclib -o libtsdll.dylib "
|
LINK=" -dynamiclib -o libtsdll.dylib "
|
||||||
;;
|
+;;
|
||||||
+freebsd_j32)
|
+freebsd_j32)
|
||||||
+TARGET=libtsdll.so
|
+TARGET=libtsdll.so
|
||||||
+COMPILE="$common -m32 "
|
+COMPILE="$common -m32 "
|
||||||
|
@ -25,7 +38,6 @@
|
||||||
+TARGET=libtsdll.so
|
+TARGET=libtsdll.so
|
||||||
+COMPILE="$common "
|
+COMPILE="$common "
|
||||||
+LINK=" -shared -Wl,-soname,libtsdll.so -o libtsdll.so "
|
+LINK=" -shared -Wl,-soname,libtsdll.so -o libtsdll.so "
|
||||||
+;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo no case for those parameters
|
echo no case for those parameters
|
||||||
exit
|
|
||||||
|
|
|
@ -1,19 +1,11 @@
|
||||||
--- make/domake.sh.orig 2018-04-09 18:08:56 UTC
|
--- make/domake.sh.orig 2019-01-06 11:36:39 UTC
|
||||||
+++ make/domake.sh
|
+++ make/domake.sh
|
||||||
@@ -3,8 +3,7 @@
|
@@ -15,7 +15,7 @@ if [ $1 = "j64nonavx" ] ; then
|
||||||
# run by build_jconsole and build_libj
|
avx=-nonavx
|
||||||
# $1 is j32 or j64
|
fi
|
||||||
|
|
||||||
-cd ~
|
-echo "building $jbld/$targ/bin/$TARGET $avx"
|
||||||
-. jvars.sh
|
|
||||||
+. make/jvars.sh
|
|
||||||
|
|
||||||
echo $TARGET
|
|
||||||
echo $COMPILE
|
|
||||||
@@ -12,5 +11,5 @@ echo $LINK
|
|
||||||
mkdir -p $jbld/jout/$TARGET/$1
|
|
||||||
cd $jbld/jout/$TARGET/$1
|
|
||||||
|
|
||||||
-make -f $jmake/makefile
|
|
||||||
+gmake -f $jmake/makefile
|
+gmake -f $jmake/makefile
|
||||||
cp $TARGET $jbld/$1/bin
|
echo "output in $jbld/$targ/bin/build_$TARGET$avx.txt"
|
||||||
|
make -f $jmake/makefile >$jbld/$targ/bin/build_$TARGET$avx.txt 2>&1
|
||||||
|
echo `egrep -w 'warning|error|note' $jbld/$targ/bin/build_$TARGET$avx.txt`
|
||||||
|
|
|
@ -1,16 +1,25 @@
|
||||||
--- make/jvars.sh.orig 2018-04-09 18:05:09 UTC
|
--- make/jvars.sh.orig 2019-03-10 15:55:44 UTC
|
||||||
+++ make/jvars.sh
|
+++ make/jvars.sh
|
||||||
@@ -1,11 +1,11 @@
|
@@ -2,7 +2,7 @@
|
||||||
# source shell script (read with . jvars.sh) so stuff is easy to find
|
# source shell script (read with . jvars.sh) so stuff is easy to find
|
||||||
|
|
||||||
# edit following if your install is not standard
|
# edit following if your install is not standard
|
||||||
-jgit=~/gitdev/jsource # git jsource folder
|
-jgit=~/git/jsource # git jsource folder
|
||||||
+jgit=~/jsource-j808-release # git jsource folder
|
+jgit=~/jsource-j807-release # git jsource folder
|
||||||
jbld=~/jbld # test libraries and binaries will be put here
|
jbld=~/jbld # test libraries and binaries will be put here
|
||||||
|
|
||||||
# edit platform to build - linux darwin raspberry
|
# platform and shared library suffix
|
||||||
-jplatform=linux
|
@@ -10,7 +10,12 @@ jplatform=`uname|tr '[:upper:]' '[:lower:]'`
|
||||||
+jplatform=freebsd
|
jsuffix=so
|
||||||
|
if [ $jplatform = "darwin" ] ; then jsuffix=dylib ; fi
|
||||||
|
|
||||||
|
-CC=clang # compiler
|
||||||
|
+USE_OPENMP="${USE_OPENMP:=0}"
|
||||||
|
+if [ $USE_OPENMP -eq 1 ] ; then
|
||||||
|
+ CC=gcc8
|
||||||
|
+else
|
||||||
|
+ CC=clang # compiler
|
||||||
|
+fi
|
||||||
|
|
||||||
# should not be necessary to edit after here
|
# should not be necessary to edit after here
|
||||||
j32=$jbld/j32/bin/jconsole
|
tsu=$jgit/test/tsu.ijs
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
--- make/makefile.orig 2016-11-25 19:04:24 UTC
|
--- make/makefile.orig 2018-10-02 13:24:06 UTC
|
||||||
+++ make/makefile
|
+++ make/makefile
|
||||||
@@ -1,5 +1,5 @@
|
@@ -3,7 +3,7 @@ vpath % $(jgit)/jsrc
|
||||||
vpath % $(jgit)/jsrc
|
%.o: %.c
|
||||||
|
$(CC) -c $(CFLAGS) $(CFLAGS_FMA) -o$@ $^
|
||||||
|
|
||||||
-CFLAGS=$(COMPILE)
|
-CFLAGS=$(COMPILE)
|
||||||
+CFLAGS+=$(COMPILE)
|
+CFLAGS+=$(COMPILE)
|
||||||
$(TARGET) : $(OBJS)
|
$(OBJS_FMA) : CFLAGS_FMA := -mfma
|
||||||
$(CC) $(OBJS) $(LINK)
|
$(TARGET) : $(OBJS) $(OBJS_FMA)
|
||||||
|
$(CC) $(OBJS) $(OBJS_FMA) $(LINK)
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
--- netdefs/netdefs.c.orig 2016-11-25 19:04:24 UTC
|
--- netdefs/netdefs.c.orig 2019-01-06 15:19:53 UTC
|
||||||
+++ netdefs/netdefs.c
|
+++ netdefs/netdefs.c
|
||||||
@@ -147,7 +147,7 @@ int main(){
|
@@ -152,7 +152,7 @@ int main(){
|
||||||
printf ("msg_iov_sz=: %d\n",sizeof(((struct msghdr*)0)->msg_iov));
|
printf ("msg_iov_sz=: " FMTI "\n",sizeof(((struct msghdr*)0)->msg_iov));
|
||||||
printf ("msg_iovlen_off=: %d\n",offset(struct msghdr,msg_iovlen));
|
printf ("msg_iovlen_off=: " FMTI "\n",offset(struct msghdr,msg_iovlen));
|
||||||
printf ("msg_iovlen_sz=: %d\n",sizeof(((struct msghdr*)0)->msg_iovlen));
|
printf ("msg_iovlen_sz=: " FMTI "\n",sizeof(((struct msghdr*)0)->msg_iovlen));
|
||||||
-#if defined(linux) || defined(Darwin)
|
-#if defined(linux) || defined(Darwin)
|
||||||
+#if defined(linux) || defined(Darwin) || defined(__FreeBSD__)
|
+#if defined(linux) || defined(Darwin) || defined(__FreeBSD__)
|
||||||
printf ("msg_control_off=: %d\n",offset(struct msghdr,msg_control));
|
printf ("msg_control_off=: " FMTI "\n",offset(struct msghdr,msg_control));
|
||||||
printf ("msg_control_sz=: %d\n",sizeof(((struct msghdr*)0)->msg_control));
|
printf ("msg_control_sz=: " FMTI "\n",sizeof(((struct msghdr*)0)->msg_control));
|
||||||
printf ("msg_controllen_off=: %d\n",offset(struct msghdr,msg_controllen));
|
printf ("msg_controllen_off=: " FMTI "\n",offset(struct msghdr,msg_controllen));
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
NB. J profile
|
NB. J profile
|
||||||
NB. JFE sets BINPATH_z_ and ARGV_z_
|
NB. JFE sets BINPATH_z_ and ARGV_z_
|
||||||
NB. add your sentences in startup.ijs
|
NB. add your sentences in startup.ijs
|
||||||
NB. $FreeBSD$
|
|
||||||
|
|
||||||
systype=. 9!:12''
|
systype=. 9!:12''
|
||||||
jpathsep_z_=: '/'&(('\' I.@:= ])})
|
jpathsep_z_=: '/'&(('\' I.@:= ])})
|
||||||
|
|
|
@ -2,6 +2,13 @@ bin/jconsole
|
||||||
lib/j/bin/jconsole
|
lib/j/bin/jconsole
|
||||||
lib/j/bin/libj.so
|
lib/j/bin/libj.so
|
||||||
lib/j/bin/libtsdll.so
|
lib/j/bin/libtsdll.so
|
||||||
|
share/j/addons/data/jfiles/history.txt
|
||||||
|
share/j/addons/data/jfiles/jfiles.ijs
|
||||||
|
share/j/addons/data/jfiles/jfiles.txt
|
||||||
|
share/j/addons/data/jfiles/keyfiles.txt
|
||||||
|
share/j/addons/data/jfiles/manifest.ijs
|
||||||
|
share/j/addons/data/jfiles/test/test0.ijs
|
||||||
|
share/j/addons/data/jfiles/test/test1.ijs
|
||||||
share/j/addons/data/jmf/history.txt
|
share/j/addons/data/jmf/history.txt
|
||||||
share/j/addons/data/jmf/jmf.ijs
|
share/j/addons/data/jmf/jmf.ijs
|
||||||
share/j/addons/data/jmf/manifest.ijs
|
share/j/addons/data/jmf/manifest.ijs
|
||||||
|
@ -109,6 +116,7 @@ share/j/system/config/folders.cfg
|
||||||
share/j/system/config/version.txt
|
share/j/system/config/version.txt
|
||||||
share/j/system/defs/hostdefs_aix.ijs
|
share/j/system/defs/hostdefs_aix.ijs
|
||||||
share/j/system/defs/hostdefs_android.ijs
|
share/j/system/defs/hostdefs_android.ijs
|
||||||
|
share/j/system/defs/hostdefs_android_64.ijs
|
||||||
share/j/system/defs/hostdefs_darwin.ijs
|
share/j/system/defs/hostdefs_darwin.ijs
|
||||||
share/j/system/defs/hostdefs_darwin_64.ijs
|
share/j/system/defs/hostdefs_darwin_64.ijs
|
||||||
share/j/system/defs/hostdefs_freebsd_64.ijs
|
share/j/system/defs/hostdefs_freebsd_64.ijs
|
||||||
|
@ -120,6 +128,7 @@ share/j/system/defs/hostdefs_win.ijs
|
||||||
share/j/system/defs/hostdefs_win_64.ijs
|
share/j/system/defs/hostdefs_win_64.ijs
|
||||||
share/j/system/defs/netdefs_aix.ijs
|
share/j/system/defs/netdefs_aix.ijs
|
||||||
share/j/system/defs/netdefs_android.ijs
|
share/j/system/defs/netdefs_android.ijs
|
||||||
|
share/j/system/defs/netdefs_android_64.ijs
|
||||||
share/j/system/defs/netdefs_darwin.ijs
|
share/j/system/defs/netdefs_darwin.ijs
|
||||||
share/j/system/defs/netdefs_darwin_64.ijs
|
share/j/system/defs/netdefs_darwin_64.ijs
|
||||||
share/j/system/defs/netdefs_freebsd_64.ijs
|
share/j/system/defs/netdefs_freebsd_64.ijs
|
||||||
|
@ -129,7 +138,6 @@ share/j/system/defs/netdefs_linux_64.ijs
|
||||||
share/j/system/defs/netdefs_sunos.ijs
|
share/j/system/defs/netdefs_sunos.ijs
|
||||||
share/j/system/defs/netdefs_win.ijs
|
share/j/system/defs/netdefs_win.ijs
|
||||||
share/j/system/defs/netdefs_win_64.ijs
|
share/j/system/defs/netdefs_win_64.ijs
|
||||||
share/j/system/main/ctag.ijs
|
|
||||||
share/j/system/main/regex.ijs
|
share/j/system/main/regex.ijs
|
||||||
share/j/system/main/regex.ijs.orig
|
share/j/system/main/regex.ijs.orig
|
||||||
share/j/system/main/socket.ijs
|
share/j/system/main/socket.ijs
|
||||||
|
@ -138,13 +146,9 @@ share/j/system/main/stdlib.ijs.orig
|
||||||
share/j/system/main/task.ijs
|
share/j/system/main/task.ijs
|
||||||
share/j/system/util/boot.ijs
|
share/j/system/util/boot.ijs
|
||||||
share/j/system/util/configure.ijs
|
share/j/system/util/configure.ijs
|
||||||
share/j/system/util/edit.png
|
|
||||||
share/j/system/util/edit.svg
|
|
||||||
share/j/system/util/jadetag.ijs
|
|
||||||
share/j/system/util/pacman.ijs
|
share/j/system/util/pacman.ijs
|
||||||
share/j/system/util/pm.ijs
|
share/j/system/util/pm.ijs
|
||||||
share/j/system/util/pp.ijs
|
share/j/system/util/pp.ijs
|
||||||
share/j/system/util/project.ijs
|
share/j/system/util/project.ijs
|
||||||
share/j/system/util/scripts.ijs
|
share/j/system/util/scripts.ijs
|
||||||
share/j/system/util/tar.ijs
|
share/j/system/util/tar.ijs
|
||||||
share/j/system/util/term.png
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue