diff options
| author | Steve Wills <swills@FreeBSD.org> | 2019-04-28 12:10:00 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2019-04-28 12:10:00 +0000 |
| commit | 7cf0b81f436dcfd0278e9661cda65af4353cc29c (patch) | |
| tree | 4741fe9c0c500413dcc4064ccb73a2ff0980ee3b /lang/J/files/patch-make_build__libj.sh | |
| parent | devel/dulwich: Update to 0.19.11 and allow including tests (diff) | |
lang/J: Update to j807-release
PR: 236454
Submitted by: João Neves <sevenjp@gmail.com> (maintainer)
Notes
Notes:
svn path=/head/; revision=500311
Diffstat (limited to 'lang/J/files/patch-make_build__libj.sh')
| -rw-r--r-- | lang/J/files/patch-make_build__libj.sh | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/lang/J/files/patch-make_build__libj.sh b/lang/J/files/patch-make_build__libj.sh index ed409dc08a90..460cdad2285c 100644 --- a/lang/J/files/patch-make_build__libj.sh +++ b/lang/J/files/patch-make_build__libj.sh @@ -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 -@@ -1,7 +1,6 @@ +@@ -1,6 +1,6 @@ #!/usr/local/bin/bash # $1 is j32 or j64 -cd ~ --. jvars.sh +. make/jvars.sh # gcc 5 vs 4 - killing off linux asm routines (overflow detection) # new fast code uses builtins not available in gcc 4 -@@ -15,6 +14,8 @@ common="-fPIC -O1 -fno-if-conversion2 -f - # clang - # 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" - 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" -+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" -+ - - case $jplatform\_$1 in - -@@ -50,6 +51,21 @@ TARGET=libj.dylib - COMPILE="$darwin -mmacosx-version-min=10.5" - LINK=" -dynamiclib -lm -ldl -mmacosx-version-min=10.5 -o libj.dylib" - ;; +@@ -14,7 +14,7 @@ if [ $USE_OPENMP -eq 1 ] ; then + OPENMP=" -fopenmp " + LDOPENMP=" -fopenmp " + if [ "x$compiler" = x'gcc' ] ; then +-LDOPENMP32=" -l:libgomp.so.1 " # gcc ++LDOPENMP32=" -l:libgomp.so " # gcc + else + LDOPENMP32=" -l:libomp.so.5 " # clang + fi +@@ -92,6 +92,22 @@ TARGET=libj.dylib + COMPILE="$darwin -mavx -mmacosx-version-min=10.5 -DC_AVX=1" + LINK=" -dynamiclib -lm -ldl $LDOPENMP -mmacosx-version-min=10.5 -o libj.dylib" + OBJS_FMA=" blis/gemm_int-fma.o " ++;; + +freebsd_j32) # freebsd x86 +TARGET=libj.so +# faster, but sse2 not available for 32-bit amd cpu +# 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 -+# COMPILE="$freebsd -m32 -ffloat-store " -+LINK=" -shared -Wl,-soname,libj.so -m32 -lm -o libj.so " ++# COMPILE="$common -m32 -ffloat-store " ++LINK=" -shared -Wl,-soname,libj.so -m32 -lm -ldl $LDOPENMP32 -o libj.so " +;; -+freebsd_j64) # freebsd x86 ++ ++freebsd_j64) # freebsd amd64 +TARGET=libj.so -+COMPILE="$freebsd -DC_NOMULTINTRINSIC " -+LINK=" -shared -Wl,-soname,libj.so -lm -o libj.so " -+;; ++COMPILE="$common -DC_NOMULTINTRINSIC " ++LINK=" -shared -Wl,-soname,libj.so -lm -ldl $LDOPENMP -o libj.so " + ;; + *) - echo no case for those parameters - exit |