Page MenuHomeFreeBSD
Files F106115847

D9965.diff
No OneTemporary
Actions

D9965.diff
View Options

Index: head/lang/julia/Makefile
===================================================================
--- head/lang/julia/Makefile
+++ head/lang/julia/Makefile
@@ -2,9 +2,8 @@
# $FreeBSD$
PORTNAME= julia
-PORTVERSION= 0.5.0
+PORTVERSION= 0.5.1
DISTVERSIONSUFFIX= -full
-PORTREVISION= 3
CATEGORIES= lang math
MASTER_SITES= https://github.com/JuliaLang/julia/releases/download/v${PORTVERSION}/
@@ -20,9 +19,8 @@
libgit2.so:devel/libgit2 \
libgmp.so:math/gmp \
libmpfr.so:math/mpfr \
- libpcre2-8.so:devel/pcre2 \
- libarpack.so:math/arpack-ng
-BUILD_DEPENDS= llvm-config38:devel/llvm38 \
+ libpcre2-8.so:devel/pcre2
+BUILD_DEPENDS= llvm-config39:devel/llvm39 \
pcre2-config:devel/pcre2 \
patchelf:sysutils/patchelf
@@ -43,8 +41,12 @@
USE_GPL_LIBS=${USE_GPL_LIBS}
OPTIONS_DEFINE= EXAMPLES DEBUG DOCS GPL_LIBS DESKTOP NATIVE
+OPTIONS_GROUP= PRIVATE
+OPTIONS_GROUP_PRIVATE= ARPACK
OPTIONS_SUB= yes
+PRIVATE_DESC= Build self-shipped private depends
+
DEBUG_VARS= FORCE_ASSERTIONS=1 \
ALL_TARGET=all
@@ -56,14 +58,19 @@
GPL_LIBS_DESC= Build with GPL libs: FFTW and SUITESPARSE
GPL_LIBS_LIB_DEPENDS= libfftw3.so:math/fftw3 \
- libfftw3f.so:math/fftw3-float \
- libumfpack.so:math/suitesparse
+ libfftw3f.so:math/fftw3-float
+GPL_LIBS_MAKE_ARGS= USE_SYSTEM_SUITESPARSE=0
GPL_LIBS_VARS= USE_GPL_LIBS=1
DESKTOP_DESC= Install icon, .desktop and appdata file
DESKTOP_VARS= INSTALL_TARGET+=install-desktop \
INSTALLS_ICONS=yes
+ARPACK_DESC= Build self-shipped private arpack-ng
+ARPACK_MAKE_ARGS= USE_SYSTEM_ARPACK=0
+ARPACK_LIB_DEPENDS_OFF= libarpack.so:math/arpack-ng
+ARPACK_MAKE_ARGS_OFF= USE_SYSTEM_ARPACK=1
+
.include <bsd.port.options.mk>
NATIVE_DESC= Build with native CPU jit tuning
Index: head/lang/julia/distinfo
===================================================================
--- head/lang/julia/distinfo
+++ head/lang/julia/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480595116
-SHA256 (julia-0.5.0-full.tar.gz) = 732478536b6dccecbf56e541eef0aed04de0e6d63ae631b136e033dda2e418a9
-SIZE (julia-0.5.0-full.tar.gz) = 93294087
+TIMESTAMP = 1488773295
+SHA256 (julia-0.5.1-full.tar.gz) = 533b6427a1b01bd38ea0601f58a32d15bf403f491b8415e9ce4305b8bc83bb21
+SIZE (julia-0.5.1-full.tar.gz) = 93326909
Index: head/lang/julia/files/patch-Make.user
===================================================================
--- head/lang/julia/files/patch-Make.user
+++ head/lang/julia/files/patch-Make.user
@@ -1,7 +1,6 @@
---- Make.user.orig 2016-12-17 12:39:14 UTC
+--- Make.user.orig 2017-02-26 09:48:03 UTC
+++ Make.user
-@@ -0,0 +1,25 @@
-+USE_SYSTEM_ARPACK= 1
+@@ -0,0 +1,23 @@
+USE_SYSTEM_BLAS= 1
+USE_SYSTEM_GMP= 1
+USE_SYSTEM_LAPACK= 1
@@ -16,10 +15,9 @@
+USE_SYSTEM_PCRE= 1
+USE_SYSTEM_UTF8PROC= 1
+
-+LLVM_CONFIG= llvm-config38
++LLVM_CONFIG= llvm-config39
+
+USE_SYSTEM_FFTW= 1
-+USE_SYSTEM_SUITESPARSE= 1
+
+LIBBLAS= -lopenblasp -L$(LOCALBASE)/lib
+LIBBLASNAME= libopenblasp
Index: head/lang/julia/files/patch-Makefile
===================================================================
--- head/lang/julia/files/patch-Makefile
+++ head/lang/julia/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig 2016-09-20 02:54:21 UTC
+--- Makefile.orig 2017-03-06 03:32:23 UTC
+++ Makefile
-@@ -327,8 +327,7 @@ define stringreplace
+@@ -328,8 +328,7 @@ define stringreplace
$(build_depsbindir)/stringreplace $$(strings -t x - $1 | grep '$2' | awk '{print $$1;}') '$3' 255 "$(call cygpath_w,$1)"
endef
@@ -10,7 +10,7 @@
@for subdir in $(bindir) $(libexecdir) $(datarootdir)/julia/site/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir); do \
mkdir -p $(DESTDIR)$$subdir; \
done
-@@ -387,10 +386,6 @@ endif
+@@ -389,10 +388,6 @@ endif
$(INSTALL_M) $(JULIAHOME)/contrib/julia-config.jl $(DESTDIR)$(datarootdir)/julia/
# Copy in all .jl sources as well
cp -R -L $(build_datarootdir)/julia $(DESTDIR)$(datarootdir)/
@@ -21,7 +21,7 @@
# Remove perf suite
-rm -rf $(DESTDIR)$(datarootdir)/julia/test/perf/
# Remove various files which should not be installed
-@@ -398,38 +393,44 @@ endif
+@@ -400,38 +395,44 @@ endif
-rm -f $(DESTDIR)$(datarootdir)/julia/test/Makefile
# Copy in beautiful new man page
$(INSTALL_F) $(build_man1dir)/julia.1 $(DESTDIR)$(man1dir)/
Index: head/lang/julia/files/patch-src_Makefile
===================================================================
--- head/lang/julia/files/patch-src_Makefile
+++ head/lang/julia/files/patch-src_Makefile
@@ -1,4 +1,4 @@
---- src/Makefile.orig 2016-09-20 02:54:21 UTC
+--- src/Makefile.orig 2017-03-06 03:32:23 UTC
+++ src/Makefile
@@ -9,7 +9,7 @@ override CFLAGS += $(JCFLAGS)
ifeq ($(LLVM_VER),3.3)
@@ -17,7 +17,7 @@
-I$(JULIAHOME)/deps/valgrind
ifneq ($(USEMSVC), 1)
FLAGS += -Wall -Wno-strict-aliasing -fno-omit-frame-pointer -fvisibility=hidden -fno-common \
-@@ -75,7 +76,7 @@ else
+@@ -76,7 +77,7 @@ else
ifeq ($(OS),WINNT)
LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(LLVM_VER_SHORT)
else
Index: head/lang/julia/pkg-plist
===================================================================
--- head/lang/julia/pkg-plist
+++ head/lang/julia/pkg-plist
@@ -29,20 +29,30 @@
include/julia/uv-unix.h
include/julia/uv-version.h
include/julia/uv.h
+%%ARPACK%%lib/julia/libarpack.so
+%%ARPACK%%lib/julia/libarpack.so.2
lib/julia/libccalltest.so
lib/julia/libdSFMT.so
lib/julia/libopenspecfun.so
lib/julia/libopenspecfun.so.1
lib/julia/libopenspecfun.so.1.3
+%%GPL_LIBS%%lib/julia/libamd.so
+%%GPL_LIBS%%lib/julia/libcamd.so
+%%GPL_LIBS%%lib/julia/libccolamd.so
+%%GPL_LIBS%%lib/julia/libcholmod.so
+%%GPL_LIBS%%lib/julia/libcolamd.so
+%%GPL_LIBS%%lib/julia/libspqr.so
%%GPL_LIBS%%lib/julia/libsuitesparse_wrapper.so
+%%GPL_LIBS%%lib/julia/libsuitesparseconfig.so
+%%GPL_LIBS%%lib/julia/libumfpack.so
%%DEBUG%%lib/julia/sys-debug.so
lib/julia/sys.so
%%DEBUG%%lib/libjulia-debug.so
%%DEBUG%%lib/libjulia-debug.so.0.5
-%%DEBUG%%lib/libjulia-debug.so.0.5.0
+%%DEBUG%%lib/libjulia-debug.so.0.5.1
lib/libjulia.so
lib/libjulia.so.0.5
-lib/libjulia.so.0.5.0
+lib/libjulia.so.0.5.1
%%DESKTOP%%share/appdata/julia.appdata.xml
%%DESKTOP%%share/applications/julia.desktop
%%DESKTOP%%share/icons/hicolor/scalable/apps/julia.svg
@@ -112,7 +122,6 @@
%%DATADIR%%/base/exports.jl
%%DATADIR%%/base/expr.jl
%%DATADIR%%/base/fastmath.jl
-%%DATADIR%%/base/fenv_constants.jl
%%DATADIR%%/base/fft/FFTW.jl
%%DATADIR%%/base/fft/dct.jl
%%DATADIR%%/base/file.jl

File Metadata

Mime Type
text/plain
Expires
Thu, Dec 26, 3:58 PM (11 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15605861
Default Alt Text
D9965.diff (6 KB)

Event Timeline