View | Details | Raw Unified | Return to bug 227395
Collapse All | Expand All

(-)Makefile (-3 / +3 lines)
Lines 8-14 Link Here
8
COMMENT=	J programming language
8
COMMENT=	J programming language
9
9
10
LICENSE=	GPLv3
10
LICENSE=	GPLv3
11
LICENSE_FILE=	${WRKDIR}/jsource-j806-release/license.txt
11
LICENSE_FILE=	${WRKDIR}/jsource-${JVERSION}/license.txt
12
12
13
ONLY_FOR_ARCHS=	amd64
13
ONLY_FOR_ARCHS=	amd64
14
ONLY_FOR_ARCHS_REASON_amd64=	Not built or tested for other archs. i386 needs hostdefs and netdefs files to be generated.
14
ONLY_FOR_ARCHS_REASON_amd64=	Not built or tested for other archs. i386 needs hostdefs and netdefs files to be generated.
Lines 28-37 Link Here
28
GH_TAGNAME=	${JVERSION}
28
GH_TAGNAME=	${JVERSION}
29
29
30
# J is released with ports-unfriendly versioning
30
# J is released with ports-unfriendly versioning
31
JVERSION=	j806-release
31
JVERSION=	j808-release
32
32
33
BIN_FILES=	jconsole
33
BIN_FILES=	jconsole
34
LIB_FILES=	libj.so libtsdll.so libjavx.so
34
LIB_FILES=	libj.so libtsdll.so
35
35
36
do-install:
36
do-install:
37
	${MKDIR} ${STAGEDIR}${PREFIX}/lib/j/bin
37
	${MKDIR} ${STAGEDIR}${PREFIX}/lib/j/bin
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1519502511
1
TIMESTAMP = 1520449029
2
SHA256 (jsoftware-jsource-806-j806-release_GH0.tar.gz) = 033a787ad3180a8ead8f4a3880c016b8581ddf6a3081f86a88774575c7cc168f
2
SHA256 (jsoftware-jsource-808-j808-release_GH0.tar.gz) = 1c7335e0d705bfc630da230ee8d196487627eed6f9374728bcac6b9ffbb1fd1d
3
SIZE (jsoftware-jsource-806-j806-release_GH0.tar.gz) = 2280551
3
SIZE (jsoftware-jsource-808-j808-release_GH0.tar.gz) = 2128876
(-)files/jconsole.in (-2 lines)
Lines 1-5 Link Here
1
#!/bin/sh
1
#!/bin/sh
2
2
3
# $FreeBSD$
4
5
exec %%LOCALBASE%%/lib/j/bin/jconsole -jprofile %%LOCALBASE%%/share/j/profile.ijs
3
exec %%LOCALBASE%%/lib/j/bin/jconsole -jprofile %%LOCALBASE%%/share/j/profile.ijs
(-)files/patch-Makefile (-7 / +3 lines)
Lines 1-11 Link Here
1
--- Makefile.orig	2018-02-24 19:49:42 UTC
1
--- Makefile.orig	2018-04-09 18:07:38 UTC
2
+++ Makefile
2
+++ Makefile
3
@@ -0,0 +1,25 @@
3
@@ -0,0 +1,21 @@
4
+.PHONY: all
4
+.PHONY: all
5
+all: make-${ARCH}
5
+all: make-${ARCH}
6
+
6
+
7
+.PHONY: make-amd64
7
+.PHONY: make-amd64
8
+make-amd64: build-j64 libj-avx
8
+make-amd64: build-j64
9
+
9
+
10
+.PHONY: make-i386
10
+.PHONY: make-i386
11
+make-i386: build-j32
11
+make-i386: build-j32
Lines 14-23 Link Here
14
+init:
14
+init:
15
+	make/install.sh
15
+	make/install.sh
16
+
16
+
17
+.PHONY: libj-avx
18
+libj-avx: init
19
+	make/build_libj.sh j64avx
20
+
21
+build-%: init
17
+build-%: init
22
+	make/build_jconsole.sh $*
18
+	make/build_jconsole.sh $*
23
+	make/build_libj.sh $*
19
+	make/build_libj.sh $*
(-)files/patch-jlibrary_system_config_base.cfg (-2 / +2 lines)
Lines 1-6 Link Here
1
--- jlibrary/system/config/base.cfg.orig	2018-02-22 18:45:28 UTC
1
--- jlibrary/system/config/base.cfg.orig	2016-11-25 19:04:24 UTC
2
+++ jlibrary/system/config/base.cfg
2
+++ jlibrary/system/config/base.cfg
3
@@ -90,6 +90,18 @@ case. 'Linux' do.
3
@@ -93,6 +93,18 @@ case. 'Linux' do.
4
   XDiff=: '/usr/bin/meld'
4
   XDiff=: '/usr/bin/meld'
5
   Editor=: 'geany +%l %f'
5
   Editor=: 'geany +%l %f'
6
   Editor_nox=: 'vi -c%l %f'
6
   Editor_nox=: 'vi -c%l %f'
(-)files/patch-jlibrary_system_main_regex.ijs (-3 / +3 lines)
Lines 1-10 Link Here
1
--- jlibrary/system/main/regex.ijs.orig	2018-02-22 18:45:28 UTC
1
--- jlibrary/system/main/regex.ijs.orig	2018-03-07 18:59:01 UTC
2
+++ jlibrary/system/main/regex.ijs
2
+++ jlibrary/system/main/regex.ijs
3
@@ -101,6 +101,7 @@ NB. rxdll is in bin or tools/regex
3
@@ -101,6 +101,7 @@ NB. rxdll is in bin or tools/regex
4
 select. UNAME
4
 select. UNAME
5
 case. 'Win' do. t=. 'jpcre.dll'
5
 case. 'Win' do. t=. 'jpcre.dll'
6
 case. 'Darwin' do. t=. 'libjpcre.dylib'
6
 case. 'Darwin' do. t=. 'libjpcre.dylib'
7
+case. 'FreeBSD' do. t=. 'libpcreposix.so'
7
+case. 'FreeBSD' do. t=. 'libpcreposix.so' 
8
 fcase. 'Linux' do.   NB. fall throught
8
 fcase. 'Linux' do.
9
   if. 2 0-:('libpcreposix.so.3 dummyfunction n')&(15!:0) ::(15!:10) '' do.
9
   if. 2 0-:('libpcreposix.so.3 dummyfunction n')&(15!:0) ::(15!:10) '' do.
10
     rxdll=: 'libpcreposix.so.3'
10
     rxdll=: 'libpcreposix.so.3'
(-)files/patch-jlibrary_system_main_stdlib.ijs (-14 / +6 lines)
Lines 1-14 Link Here
1
--- jlibrary/system/main/stdlib.ijs.orig	2018-02-22 18:45:28 UTC
1
--- jlibrary/system/main/stdlib.ijs.orig	2016-11-25 19:04:24 UTC
2
+++ jlibrary/system/main/stdlib.ijs
2
+++ jlibrary/system/main/stdlib.ijs
3
@@ -35,6 +35,7 @@ if. notdef 'UNAME' do.
3
@@ -93,6 +93,7 @@ if. (<'home') -.@e. {."1 SystemFolders d
4
   end.
5
 end.
6
 'libc.so.6 setlocale > x i *c'&(15!:0)^:(UNAME-:'Linux') 1;,'C'
7
+'libc.so.7 setlocale > x i *c'&(15!:0)^:(UNAME-:'FreeBSD') 1;,'C'
8
 if. notdef 'IFRASPI' do.
9
   if. UNAME -: 'Linux' do.
10
     cpu=. 2!:0 'cat /proc/cpuinfo'
11
@@ -97,6 +98,7 @@ if. (<'home') -.@e. {."1 SystemFolders d
12
   elseif. 'Android'-:UNAME do. t=. '/sdcard'
4
   elseif. 'Android'-:UNAME do. t=. '/sdcard'
13
   elseif. 'Darwin'-:UNAME do. t=. (0-:t){::'';~t=. 2!:5'HOME'
5
   elseif. 'Darwin'-:UNAME do. t=. (0-:t){::'';~t=. 2!:5'HOME'
14
   elseif. 'Linux'-:UNAME do. t=. (0-:t){::'';~t=. 2!:5'HOME'
6
   elseif. 'Linux'-:UNAME do. t=. (0-:t){::'';~t=. 2!:5'HOME'
Lines 16-22 Link Here
16
   elseif. do. t=. ''
8
   elseif. do. t=. ''
17
   end.
9
   end.
18
   if. (''-:t)+.((,'/')-:t)+.('/root'-:t)+.('/usr/'-:5{.t) do.
10
   if. (''-:t)+.((,'/')-:t)+.('/root'-:t)+.('/usr/'-:5{.t) do.
19
@@ -111,6 +113,7 @@ if. (<'temp') -.@e. {."1 SystemFolders d
11
@@ -107,6 +108,7 @@ if. (<'temp') -.@e. {."1 SystemFolders d
20
   elseif. 'Android'-:UNAME do. t=. '/sdcard'
12
   elseif. 'Android'-:UNAME do. t=. '/sdcard'
21
   elseif. 'Darwin'-:UNAME do. 1!:5 ::] <t=. '/tmp/',":2!:6''
13
   elseif. 'Darwin'-:UNAME do. 1!:5 ::] <t=. '/tmp/',":2!:6''
22
   elseif. 'Linux'-:UNAME do. 1!:5 ::] <t=. '/tmp/',":2!:6''
14
   elseif. 'Linux'-:UNAME do. 1!:5 ::] <t=. '/tmp/',":2!:6''
Lines 24-30 Link Here
24
   elseif. do. t=. ''
16
   elseif. do. t=. ''
25
   end.
17
   end.
26
   SystemFolders=: SystemFolders, 'temp';t
18
   SystemFolders=: SystemFolders, 'temp';t
27
@@ -123,14 +126,14 @@ end.
19
@@ -119,14 +121,14 @@ end.
28
 18!:4 <'z'
20
 18!:4 <'z'
29
 18!:4 <'z'
21
 18!:4 <'z'
30
 UNXLIB=: ([: <;._1 ' ',]);._2 (0 : 0)
22
 UNXLIB=: ([: <;._1 ' ',]);._2 (0 : 0)
Lines 44-51 Link Here
44
 (<r,c) {:: UNXLIB_z_
36
 (<r,c) {:: UNXLIB_z_
45
 )
37
 )
46
 18!:4 <'z'
38
 18!:4 <'z'
47
@@ -1344,7 +1347,7 @@ require 'pacman'
39
@@ -1337,7 +1339,7 @@ require 'pacman'
48
 x do_install_jpacman_ y
40
 do_install_jpacman_ y
49
 )
41
 )
50
 getqtbin=: 3 : 0
42
 getqtbin=: 3 : 0
51
-if. (<UNAME) -.@e. 'Linux';'Darwin';'Win' do. return. end.
43
-if. (<UNAME) -.@e. 'Linux';'Darwin';'Win' do. return. end.
(-)files/patch-jsrc_jeload.c (-11 lines)
Lines 1-11 Link Here
1
--- jsrc/jeload.c.orig	2018-02-22 18:45:28 UTC
2
+++ jsrc/jeload.c
3
@@ -322,6 +322,8 @@ int jefirst(int type,char* arg)
4
 	strcat(input,"[UNAME_z_=:'Win'");
5
 #elif defined(__MACH__)
6
 	strcat(input,"[UNAME_z_=:'Darwin'");
7
+#elif defined(__FreeBSD__)
8
+	strcat(input,"[UNAME_z_=:'FreeBSD'");
9
 #elif !defined(ANDROID)
10
 	strcat(input,"[UNAME_z_=:'Linux'");
11
 #endif
(-)files/patch-make_build__jconsole.sh (-4 / +4 lines)
Lines 1-4 Link Here
1
--- make/build_jconsole.sh.orig	2018-02-24 19:49:42 UTC
1
--- make/build_jconsole.sh.orig	2018-04-09 17:54:22 UTC
2
+++ make/build_jconsole.sh
2
+++ make/build_jconsole.sh
3
@@ -1,9 +1,8 @@
3
@@ -1,9 +1,8 @@
4
 #!/usr/local/bin/bash
4
 #!/usr/local/bin/bash
Lines 7-18 Link Here
7
-. jvars.sh
7
-. jvars.sh
8
+. make/jvars.sh
8
+. make/jvars.sh
9
 
9
 
10
-common=" -fPIC -O1 -Wextra -Wno-unused-parameter "
10
-common=" -fPIC -O1 -Wextra "
11
+common=" -fPIC -Wextra -Wno-unused-parameter "
11
+common=" -fPIC -Wextra "
12
 
12
 
13
 case $jplatform\_$1 in
13
 case $jplatform\_$1 in
14
 
14
 
15
@@ -31,6 +30,14 @@ darwin_j64)
15
@@ -27,6 +26,14 @@ darwin_j64)
16
 COMPILE="$common -DREADLINE -mmacosx-version-min=10.5"
16
 COMPILE="$common -DREADLINE -mmacosx-version-min=10.5"
17
 LINK=" -ledit -ldl -lncurses -mmacosx-version-min=10.5 -o jconsole "
17
 LINK=" -ledit -ldl -lncurses -mmacosx-version-min=10.5 -o jconsole "
18
 ;;
18
 ;;
(-)files/patch-make_build__jdll.sh (-54 lines)
Lines 1-54 Link Here
1
--- make/build_jdll.sh.orig	2018-02-24 19:49:42 UTC
2
+++ make/build_jdll.sh
3
@@ -1,7 +1,6 @@
4
 #!/usr/local/bin/bash
5
 # $1 is j32 or j64
6
-cd ~
7
-. jvars.sh
8
+. make/jvars.sh
9
 
10
 # gcc 5 vs 4 - killing off linux asm routines (overflow detection)
11
 # new fast code uses builtins not available in gcc 4
12
@@ -37,10 +36,10 @@ fi
13
 
14
 if [ "x$COMPILER" = x'gcc' ] ; then
15
 # gcc
16
-common="$OPENMP -fPIC -O1 -fwrapv -fno-strict-aliasing -Wextra -Wno-maybe-uninitialized -Wno-unused-parameter -Wno-sign-compare -Wno-clobbered -Wno-empty-body -Wno-unused-value -Wno-pointer-sign -Wno-parentheses -Wno-shift-negative-value"
17
+common="$OPENMP -fPIC -fwrapv -fno-strict-aliasing -Wextra -Wno-maybe-uninitialized -Wno-unused-parameter -Wno-sign-compare -Wno-clobbered -Wno-empty-body -Wno-unused-value -Wno-pointer-sign -Wno-parentheses -Wno-shift-negative-value"
18
 else
19
 # clang 3.5 .. 5.0
20
-common="$OPENMP -Werror -fPIC -O1 -fwrapv -fno-strict-aliasing -Wextra -Wno-consumed -Wno-uninitialized -Wno-unused-parameter -Wno-sign-compare -Wno-empty-body -Wno-unused-value -Wno-pointer-sign -Wno-parentheses -Wno-unsequenced -Wno-string-plus-int"
21
+common="$OPENMP -Werror -fPIC -fwrapv -fno-strict-aliasing -Wextra -Wno-consumed -Wno-uninitialized -Wno-unused-parameter -Wno-sign-compare -Wno-empty-body -Wno-unused-value -Wno-pointer-sign -Wno-parentheses -Wno-unsequenced -Wno-string-plus-int"
22
 fi
23
 darwin="$OPENMP -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"
24
 
25
@@ -101,6 +100,29 @@ LINK=" -dynamiclib -lm -ldl $LDOPENMP -m
26
 OBJS_FMA=" blis/gemm_int-fma.o "
27
 ;;
28
 
29
+freebsd_j32) # freebsd x86
30
+TARGET=libj.so
31
+# faster, but sse2 not available for 32-bit amd cpu
32
+# sse does not support mfpmath=sse in 32-bit gcc
33
+COMPILE="$common -m32 -msse2 -mfpmath=sse -DC_NOMULTINTRINSIC "
34
+# slower, use 387 fpu and truncate extra precision
35
+# COMPILE="$common -m32 -ffloat-store "
36
+LINK=" -shared -Wl,-soname,libj.so -m32 -lm $LDOPENMP32 -o libj.so "
37
+;;
38
+
39
+freebsd_j64) # freebsd intel 64bit
40
+TARGET=libj.so
41
+COMPILE="$common $OPENMP "
42
+LINK=" -shared -Wl,-soname,libj.so -lm $LDOPENMP -o libj.so "
43
+;;
44
+
45
+freebsd_j64avx) # freebsd intel 64bit avx
46
+TARGET=libj.so
47
+COMPILE="$common -mavx -DC_AVX=1 $OPENMP "
48
+LINK=" -shared -Wl,-soname,libj.so -lm $LDOPENMP -o libj.so "
49
+OBJS_FMA=" blis/gemm_int-fma.o "
50
+;;
51
+
52
 windows_j32) # windows x86
53
 DLLOBJS=" jdll.o jdllcomx.o "
54
 LIBJDEF=" $jgit/dllsrc/jdll.def "
(-)files/patch-make_build__libj.sh (-53 / +18 lines)
Lines 1-4 Link Here
1
--- make/build_libj.sh.orig	2018-02-24 19:49:42 UTC
1
--- make/build_libj.sh.orig	2018-04-09 18:12:26 UTC
2
+++ make/build_libj.sh
2
+++ make/build_libj.sh
3
@@ -1,7 +1,6 @@
3
@@ -1,7 +1,6 @@
4
 #!/usr/local/bin/bash
4
 #!/usr/local/bin/bash
Lines 9-77 Link Here
9
 
9
 
10
 # gcc 5 vs 4 - killing off linux asm routines (overflow detection)
10
 # gcc 5 vs 4 - killing off linux asm routines (overflow detection)
11
 # new fast code uses builtins not available in gcc 4
11
 # new fast code uses builtins not available in gcc 4
12
@@ -38,10 +37,10 @@ fi
12
@@ -15,6 +14,8 @@ common="-fPIC -O1 -fno-if-conversion2 -f
13
 # clang
14
 # 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"
15
 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"
16
+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"
17
+
13
 
18
 
14
 if [ "x$COMPILER" = x'gcc' ] ; then
19
 case $jplatform\_$1 in
15
 # gcc
16
-common="$OPENMP -fPIC -O1 -fwrapv -fno-strict-aliasing -Wextra -Wno-maybe-uninitialized -Wno-unused-parameter -Wno-sign-compare -Wno-clobbered -Wno-empty-body -Wno-unused-value -Wno-pointer-sign -Wno-parentheses -Wno-shift-negative-value"
17
+common="$OPENMP -fPIC -fwrapv -fno-strict-aliasing -Wextra -Wno-maybe-uninitialized -Wno-unused-parameter -Wno-sign-compare -Wno-clobbered -Wno-empty-body -Wno-unused-value -Wno-pointer-sign -Wno-parentheses -Wno-shift-negative-value"
18
 else
19
 # clang 3.5 .. 5.0
20
-common="$OPENMP -Werror -fPIC -O1 -fwrapv -fno-strict-aliasing -Wextra -Wno-consumed -Wno-uninitialized -Wno-unused-parameter -Wno-sign-compare -Wno-empty-body -Wno-unused-value -Wno-pointer-sign -Wno-parentheses -Wno-unsequenced -Wno-string-plus-int"
21
+common="$OPENMP -Werror -fPIC -fwrapv -fno-strict-aliasing -Wextra -Wno-consumed -Wno-uninitialized -Wno-unused-parameter -Wno-sign-compare -Wno-empty-body -Wno-unused-value -Wno-pointer-sign -Wno-parentheses -Wno-unsequenced -Wno-string-plus-int"
22
 fi
23
 darwin="$OPENMP -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"
24
 
20
 
25
@@ -55,19 +54,19 @@ TARGET=libj.so
21
@@ -50,6 +51,21 @@ TARGET=libj.dylib
26
 COMPILE="$common -m32 -msse2 -mfpmath=sse -DC_NOMULTINTRINSIC "
22
 COMPILE="$darwin -mmacosx-version-min=10.5"
27
 # slower, use 387 fpu and truncate extra precision
23
 LINK=" -dynamiclib -lm -ldl -mmacosx-version-min=10.5 -o libj.dylib"
28
 # COMPILE="$common -m32 -ffloat-store "
29
-LINK=" -shared -Wl,-soname,libj.so -m32 -lm -ldl $LDOPENMP32 -o libj.so "
30
+LINK=" -shared -Wl,-soname,libj.so -m32 -lm $LDOPENMP32 -o libj.so "
31
 ;;
24
 ;;
32
 
25
+
33
 linux_j64) # linux intel 64bit
34
 TARGET=libj.so
35
 COMPILE="$common "
36
-LINK=" -shared -Wl,-soname,libj.so -lm -ldl $LDOPENMP -o libj.so "
37
+LINK=" -shared -Wl,-soname,libj.so -lm $LDOPENMP -o libj.so "
38
 ;;
39
 
40
 linux_j64avx) # linux intel 64bit avx
41
 TARGET=libj.so
42
 COMPILE="$common -mavx -DC_AVX=1 "
43
-LINK=" -shared -Wl,-soname,libj.so -lm -ldl $LDOPENMP -o libj.so "
44
+LINK=" -shared -Wl,-soname,libj.so -lm $LDOPENMP -o libj.so "
45
 OBJS_FMA=" blis/gemm_int-fma.o "
46
 ;;
47
 
48
@@ -102,6 +101,29 @@ LINK=" -dynamiclib -lm -ldl $LDOPENMP -m
49
 OBJS_FMA=" blis/gemm_int-fma.o "
50
 ;;
51
 
52
+freebsd_j32) # freebsd x86
26
+freebsd_j32) # freebsd x86
53
+TARGET=libj.so
27
+TARGET=libj.so
54
+# faster, but sse2 not available for 32-bit amd cpu
28
+# faster, but sse2 not available for 32-bit amd cpu
55
+# sse does not support mfpmath=sse in 32-bit gcc
29
+# sse does not support mfpmath=sse in 32-bit gcc
56
+COMPILE="$common -m32 -msse2 -mfpmath=sse -DC_NOMULTINTRINSIC "
30
+COMPILE="$freebsd -m32 -msse2 -mfpmath=sse -DC_NOMULTINTRINSIC "
57
+# slower, use 387 fpu and truncate extra precision
31
+# slower, use 387 fpu and truncate extra precision
58
+# COMPILE="$common -m32 -ffloat-store "
32
+# COMPILE="$freebsd -m32 -ffloat-store "
59
+LINK=" -shared -Wl,-soname,libj.so -m32 -lm $LDOPENMP32 -o libj.so "
33
+LINK=" -shared -Wl,-soname,libj.so -m32 -lm -o libj.so "
60
+;;
34
+;;
61
+
35
+freebsd_j64) # freebsd x86
62
+freebsd_j64) # freebsd intel 64bit
63
+TARGET=libj.so
36
+TARGET=libj.so
64
+COMPILE="$common "
37
+COMPILE="$freebsd -DC_NOMULTINTRINSIC "
65
+LINK=" -shared -Wl,-soname,libj.so -lm $LDOPENMP -o libj.so "
38
+LINK=" -shared -Wl,-soname,libj.so -lm -o libj.so "
66
+;;
39
+;;
67
+
68
+freebsd_j64avx) # freebsd intel 64bit avx
69
+TARGET=libj.so
70
+COMPILE="$common -mavx -DC_AVX=1 "
71
+LINK=" -shared -Wl,-soname,libj.so -lm $LDOPENMP -o libj.so "
72
+OBJS_FMA=" blis/gemm_int-fma.o "
73
+;;
74
+
75
 *)
40
 *)
76
 echo no case for those parameters
41
 echo no case for those parameters
77
 exit
42
 exit
(-)files/patch-make_build__tsdll.sh (-2 / +2 lines)
Lines 1-4 Link Here
1
--- make/build_tsdll.sh.orig	2018-02-24 19:49:42 UTC
1
--- make/build_tsdll.sh.orig	2018-04-09 18:00:06 UTC
2
+++ make/build_tsdll.sh
2
+++ make/build_tsdll.sh
3
@@ -1,9 +1,8 @@
3
@@ -1,9 +1,8 @@
4
 #!/usr/local/bin/bash
4
 #!/usr/local/bin/bash
Lines 12-18 Link Here
12
 
12
 
13
 case $jplatform\_$1 in
13
 case $jplatform\_$1 in
14
 
14
 
15
@@ -38,6 +37,16 @@ TARGET=libtsdll.dylib
15
@@ -33,6 +32,16 @@ TARGET=libtsdll.dylib
16
 COMPILE="$common "
16
 COMPILE="$common "
17
 LINK=" -dynamiclib -o libtsdll.dylib "
17
 LINK=" -dynamiclib -o libtsdll.dylib "
18
 ;;
18
 ;;
(-)files/patch-make_domake.sh (-6 / +4 lines)
Lines 1-4 Link Here
1
--- make/domake.sh.orig	2017-11-02 18:50:23 UTC
1
--- make/domake.sh.orig	2018-04-09 18:08:56 UTC
2
+++ make/domake.sh
2
+++ make/domake.sh
3
@@ -3,8 +3,7 @@
3
@@ -3,8 +3,7 @@
4
 # run by build_jconsole and build_libj
4
 # run by build_jconsole and build_libj
Lines 10-21 Link Here
10
 
10
 
11
 echo $TARGET
11
 echo $TARGET
12
 echo $COMPILE
12
 echo $COMPILE
13
@@ -12,7 +11,7 @@ echo $LINK
13
@@ -12,5 +11,5 @@ echo $LINK
14
 mkdir -p $jbld/jout/$TARGET/$1/blis
14
 mkdir -p $jbld/jout/$TARGET/$1
15
 cd $jbld/jout/$TARGET/$1
15
 cd $jbld/jout/$TARGET/$1
16
 
16
 
17
-make -f $jmake/makefile
17
-make -f $jmake/makefile
18
+gmake -f $jmake/makefile
18
+gmake -f $jmake/makefile
19
 
19
 cp $TARGET $jbld/$1/bin
20
 if [ $1 = "j64avx" ] ; then
21
  if [ $TARGET = "libj.dylib" ] ; then
(-)files/patch-make_jvars.sh (-2 / +2 lines)
Lines 1-4 Link Here
1
--- make/jvars.sh.orig	2017-11-02 18:50:23 UTC
1
--- make/jvars.sh.orig	2018-04-09 18:05:09 UTC
2
+++ make/jvars.sh
2
+++ make/jvars.sh
3
@@ -1,11 +1,11 @@
3
@@ -1,11 +1,11 @@
4
 # source shell script (read with . jvars.sh) so stuff is easy to find
4
 # source shell script (read with . jvars.sh) so stuff is easy to find
Lines 5-11 Link Here
5
 
5
 
6
 # edit following if your install is not standard 
6
 # edit following if your install is not standard 
7
-jgit=~/gitdev/jsource # git jsource folder
7
-jgit=~/gitdev/jsource # git jsource folder
8
+jgit=~/jsource-j806-release # git jsource folder
8
+jgit=~/jsource-j808-release # git jsource folder
9
 jbld=~/jbld           # test libraries and binaries will be put here
9
 jbld=~/jbld           # test libraries and binaries will be put here
10
 
10
 
11
 # edit platform to build - linux darwin raspberry
11
 # edit platform to build - linux darwin raspberry
(-)files/patch-make_makefile (-7 / +5 lines)
Lines 1-11 Link Here
1
--- make/makefile.orig	2018-02-24 19:45:08 UTC
1
--- make/makefile.orig	2016-11-25 19:04:24 UTC
2
+++ make/makefile
2
+++ make/makefile
3
@@ -3,7 +3,7 @@ vpath % $(jgit)/jsrc
3
@@ -1,5 +1,5 @@
4
 %.o: %.c
4
 vpath % $(jgit)/jsrc
5
 	$(CC) -c $(CFLAGS) $(CFLAGS_FMA) -o$@ $^
6
 
5
 
7
-CFLAGS=$(COMPILE)
6
-CFLAGS=$(COMPILE)
8
+CFLAGS+=$(COMPILE)
7
+CFLAGS+=$(COMPILE)
9
 $(OBJS_FMA) : CFLAGS_FMA := -mfma 
8
 $(TARGET) : $(OBJS)
10
 $(TARGET) : $(OBJS) $(OBJS_FMA)
9
 	$(CC)  $(OBJS) $(LINK)
11
 	$(CC)  $(OBJS) $(OBJS_FMA) $(LINK)
(-)files/patch-netdefs_netdefs.c (-8 / +8 lines)
Lines 1-11 Link Here
1
--- netdefs/netdefs.c.orig	2018-02-22 18:45:28 UTC
1
--- netdefs/netdefs.c.orig	2016-11-25 19:04:24 UTC
2
+++ netdefs/netdefs.c
2
+++ netdefs/netdefs.c
3
@@ -152,7 +152,7 @@ int main(){
3
@@ -147,7 +147,7 @@ int main(){
4
 	printf ("msg_iov_sz=: " FMTI "\n",sizeof(((struct msghdr*)0)->msg_iov));
4
 	printf ("msg_iov_sz=: %d\n",sizeof(((struct msghdr*)0)->msg_iov));
5
 	printf ("msg_iovlen_off=: " FMTI "\n",offset(struct msghdr,msg_iovlen));
5
 	printf ("msg_iovlen_off=: %d\n",offset(struct msghdr,msg_iovlen));
6
 	printf ("msg_iovlen_sz=: " FMTI "\n",sizeof(((struct msghdr*)0)->msg_iovlen));
6
 	printf ("msg_iovlen_sz=: %d\n",sizeof(((struct msghdr*)0)->msg_iovlen));
7
-#if defined(linux) || defined(Darwin)
7
-#if defined(linux) || defined(Darwin)
8
+#if defined(linux) || defined(Darwin) || defined(__FreeBSD__)
8
+#if defined(linux) || defined(Darwin) || defined(__FreeBSD__)
9
 	printf ("msg_control_off=: " FMTI "\n",offset(struct msghdr,msg_control));
9
 	printf ("msg_control_off=: %d\n",offset(struct msghdr,msg_control));
10
 	printf ("msg_control_sz=: " FMTI "\n",sizeof(((struct msghdr*)0)->msg_control));
10
 	printf ("msg_control_sz=: %d\n",sizeof(((struct msghdr*)0)->msg_control));
11
 	printf ("msg_controllen_off=: " FMTI "\n",offset(struct msghdr,msg_controllen));
11
 	printf ("msg_controllen_off=: %d\n",offset(struct msghdr,msg_controllen));
(-)files/profile.ijs.in (-1 lines)
Lines 1-7 Link Here
1
NB. J profile
1
NB. J profile
2
NB. JFE sets BINPATH_z_ and ARGV_z_
2
NB. JFE sets BINPATH_z_ and ARGV_z_
3
NB. add your sentences in startup.ijs
3
NB. add your sentences in startup.ijs
4
NB. $FreeBSD$
5
4
6
systype=. 9!:12''
5
systype=. 9!:12''
7
jpathsep_z_=: '/'&(('\' I.@:= ])})
6
jpathsep_z_=: '/'&(('\' I.@:= ])})
(-)pkg-plist (-3 / +10 lines)
Lines 1-7 Link Here
1
bin/jconsole
1
bin/jconsole
2
lib/j/bin/jconsole
2
lib/j/bin/jconsole
3
lib/j/bin/libj.so
3
lib/j/bin/libj.so
4
lib/j/bin/libjavx.so
5
lib/j/bin/libtsdll.so
4
lib/j/bin/libtsdll.so
6
share/j/addons/data/jmf/history.txt
5
share/j/addons/data/jmf/history.txt
7
share/j/addons/data/jmf/jmf.ijs
6
share/j/addons/data/jmf/jmf.ijs
Lines 105-118 Link Here
105
share/j/addons/ide/jhs/utiljs.ijs
104
share/j/addons/ide/jhs/utiljs.ijs
106
share/j/profile.ijs
105
share/j/profile.ijs
107
share/j/system/config/base.cfg
106
share/j/system/config/base.cfg
107
share/j/system/config/base.cfg.orig
108
share/j/system/config/folders.cfg
108
share/j/system/config/folders.cfg
109
share/j/system/config/version.txt
109
share/j/system/config/version.txt
110
share/j/system/defs/hostdefs_aix.ijs
110
share/j/system/defs/hostdefs_aix.ijs
111
share/j/system/defs/hostdefs_android.ijs
111
share/j/system/defs/hostdefs_android.ijs
112
share/j/system/defs/hostdefs_android_64.ijs
113
share/j/system/defs/hostdefs_darwin.ijs
112
share/j/system/defs/hostdefs_darwin.ijs
114
share/j/system/defs/hostdefs_darwin_64.ijs
113
share/j/system/defs/hostdefs_darwin_64.ijs
115
share/j/system/defs/hostdefs_freebsd_64.ijs
114
share/j/system/defs/hostdefs_freebsd_64.ijs
115
share/j/system/defs/hostdefs_freebsd_64.ijs.orig
116
share/j/system/defs/hostdefs_linux.ijs
116
share/j/system/defs/hostdefs_linux.ijs
117
share/j/system/defs/hostdefs_linux_64.ijs
117
share/j/system/defs/hostdefs_linux_64.ijs
118
share/j/system/defs/hostdefs_sunos.ijs
118
share/j/system/defs/hostdefs_sunos.ijs
Lines 120-140 Link Here
120
share/j/system/defs/hostdefs_win_64.ijs
120
share/j/system/defs/hostdefs_win_64.ijs
121
share/j/system/defs/netdefs_aix.ijs
121
share/j/system/defs/netdefs_aix.ijs
122
share/j/system/defs/netdefs_android.ijs
122
share/j/system/defs/netdefs_android.ijs
123
share/j/system/defs/netdefs_android_64.ijs
124
share/j/system/defs/netdefs_darwin.ijs
123
share/j/system/defs/netdefs_darwin.ijs
125
share/j/system/defs/netdefs_darwin_64.ijs
124
share/j/system/defs/netdefs_darwin_64.ijs
126
share/j/system/defs/netdefs_freebsd_64.ijs
125
share/j/system/defs/netdefs_freebsd_64.ijs
126
share/j/system/defs/netdefs_freebsd_64.ijs.orig
127
share/j/system/defs/netdefs_linux.ijs
127
share/j/system/defs/netdefs_linux.ijs
128
share/j/system/defs/netdefs_linux_64.ijs
128
share/j/system/defs/netdefs_linux_64.ijs
129
share/j/system/defs/netdefs_sunos.ijs
129
share/j/system/defs/netdefs_sunos.ijs
130
share/j/system/defs/netdefs_win.ijs
130
share/j/system/defs/netdefs_win.ijs
131
share/j/system/defs/netdefs_win_64.ijs
131
share/j/system/defs/netdefs_win_64.ijs
132
share/j/system/main/ctag.ijs
132
share/j/system/main/regex.ijs
133
share/j/system/main/regex.ijs
134
share/j/system/main/regex.ijs.orig
133
share/j/system/main/socket.ijs
135
share/j/system/main/socket.ijs
134
share/j/system/main/stdlib.ijs
136
share/j/system/main/stdlib.ijs
137
share/j/system/main/stdlib.ijs.orig
135
share/j/system/main/task.ijs
138
share/j/system/main/task.ijs
136
share/j/system/util/boot.ijs
139
share/j/system/util/boot.ijs
137
share/j/system/util/configure.ijs
140
share/j/system/util/configure.ijs
141
share/j/system/util/edit.png
142
share/j/system/util/edit.svg
143
share/j/system/util/jadetag.ijs
138
share/j/system/util/pacman.ijs
144
share/j/system/util/pacman.ijs
139
share/j/system/util/pm.ijs
145
share/j/system/util/pm.ijs
140
share/j/system/util/pp.ijs
146
share/j/system/util/pp.ijs
Lines 141-143 Link Here
141
share/j/system/util/project.ijs
147
share/j/system/util/project.ijs
142
share/j/system/util/scripts.ijs
148
share/j/system/util/scripts.ijs
143
share/j/system/util/tar.ijs
149
share/j/system/util/tar.ijs
150
share/j/system/util/term.png

Return to bug 227395