Attachment #180725 for bug #217704

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




# $FreeBSD$

PORTNAME=	julia
PORTVERSION=	0.5.1
DISTVERSIONSUFFIX=	-full
PORTREVISION=	3
CATEGORIES=	lang math
MASTER_SITES=	https://github.com/JuliaLang/julia/releases/download/v${PORTVERSION}/


		libgit2.so:devel/libgit2 \
		libgmp.so:math/gmp \
		libmpfr.so:math/mpfr \
		libpcre2-8.so:devel/pcre2
BUILD_DEPENDS=	llvm-config39:devel/llvm39 \
BUILD_DEPENDS=	llvm-config38:devel/llvm38 \
		pcre2-config:devel/pcre2 \
		patchelf:sysutils/patchelf


		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



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
GPL_LIBS_VARS=	USE_GPL_LIBS=1

DESKTOP_DESC=	Install icon, .desktop and appdata file

.endif
.endif

ARPACK_DESC=	Build self-shipped private arpack-ng
.if ${PORT_OPTIONS:MARPACK}
MAKE_ARGS+=	USE_SYSTEM_ARPACK=0
.else
MAKE_ARGS+=	USE_SYSTEM_ARPACK=1
LIB_DEPENDS+=	libarpack.so:math/arpack-ng
.endif

.if ${PORT_OPTIONS:MGPL_LIBS}
MAKE_ARGS+=	USE_SYSTEM_SUITESPARSE=0
.endif

.if ${ARCH} == "i386"
EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ui_Makefile
.endif

Lines 1-3 Link Here

(-)b/lang/julia/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1480595116	1	TIMESTAMP = 1488773295
2	SHA256 (julia-0.5.0-full.tar.gz) = 732478536b6dccecbf56e541eef0aed04de0e6d63ae631b136e033dda2e418a9	2	SHA256 (julia-0.5.1-full.tar.gz) = 533b6427a1b01bd38ea0601f58a32d15bf403f491b8415e9ce4305b8bc83bb21
3	SIZE (julia-0.5.0-full.tar.gz) = 93294087	3	SIZE (julia-0.5.1-full.tar.gz) = 93326909




--- Make.user.orig	2017-02-26 09:48:03 UTC
+++ Make.user
@@ -0,0 +1,23 @@
+USE_SYSTEM_ARPACK=	1
+USE_SYSTEM_BLAS=	1
+USE_SYSTEM_GMP=		1
+USE_SYSTEM_LAPACK=	1

+USE_SYSTEM_PCRE=	1
+USE_SYSTEM_UTF8PROC=	1
+
+LLVM_CONFIG=	llvm-config39
+
+USE_SYSTEM_FFTW=	1
+USE_SYSTEM_SUITESPARSE=	1
+
+LIBBLAS=	-lopenblasp -L$(LOCALBASE)/lib
+LIBBLASNAME=	libopenblasp




--- Makefile.orig	2017-03-06 03:32:23 UTC
+++ Makefile
@@ -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
 

 	@for subdir in $(bindir) $(libexecdir) $(datarootdir)/julia/site/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir); do \
 		mkdir -p $(DESTDIR)$$subdir; \
 	done
@@ -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)/

 	# Remove perf suite
 	-rm -rf $(DESTDIR)$(datarootdir)/julia/test/perf/
 	# Remove various files which should not be installed
@@ -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)/

Lines 1-4 Link Here

(-)b/lang/julia/files/patch-src_Makefile (-2 / +2 lines)
1	--- src/Makefile.orig 2016-09-20 02:54:21 UTC	1	--- src/Makefile.orig 2017-03-06 03:32:23 UTC
2	+++ src/Makefile	2	+++ src/Makefile
3	@@ -9,7 +9,7 @@ override CFLAGS += $(JCFLAGS)	3	@@ -9,7 +9,7 @@ override CFLAGS += $(JCFLAGS)
4	ifeq ($(LLVM_VER),3.3)	4	ifeq ($(LLVM_VER),3.3)
Lines 17-23 Link Here
17	-I$(JULIAHOME)/deps/valgrind	17	-I$(JULIAHOME)/deps/valgrind
18	ifneq ($(USEMSVC), 1)	18	ifneq ($(USEMSVC), 1)
19	FLAGS += -Wall -Wno-strict-aliasing -fno-omit-frame-pointer -fvisibility=hidden -fno-common \	19	FLAGS += -Wall -Wno-strict-aliasing -fno-omit-frame-pointer -fvisibility=hidden -fno-common \
20	@@ -75,7 +76,7 @@ else	20	@@ -76,7 +77,7 @@ else
21	ifeq ($(OS),WINNT)	21	ifeq ($(OS),WINNT)
22	LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(LLVM_VER_SHORT)	22	LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(LLVM_VER_SHORT)
23	else	23	else

Lines 29-48 include/julia/uv-threadpool.h Link Here

(-)b/lang/julia/pkg-plist (-3 / +12 lines)
29	include/julia/uv-unix.h	29	include/julia/uv-unix.h
30	include/julia/uv-version.h	30	include/julia/uv-version.h
31	include/julia/uv.h	31	include/julia/uv.h
		32	%%ARPACK%%lib/julia/libarpack.so
		33	%%ARPACK%%lib/julia/libarpack.so.2
32	lib/julia/libccalltest.so	34	lib/julia/libccalltest.so
33	lib/julia/libdSFMT.so	35	lib/julia/libdSFMT.so
34	lib/julia/libopenspecfun.so	36	lib/julia/libopenspecfun.so
35	lib/julia/libopenspecfun.so.1	37	lib/julia/libopenspecfun.so.1
36	lib/julia/libopenspecfun.so.1.3	38	lib/julia/libopenspecfun.so.1.3
		39	%%GPL_LIBS%%lib/julia/libamd.so
		40	%%GPL_LIBS%%lib/julia/libcamd.so
		41	%%GPL_LIBS%%lib/julia/libccolamd.so
		42	%%GPL_LIBS%%lib/julia/libcholmod.so
		43	%%GPL_LIBS%%lib/julia/libcolamd.so
		44	%%GPL_LIBS%%lib/julia/libspqr.so
37	%%GPL_LIBS%%lib/julia/libsuitesparse_wrapper.so	45	%%GPL_LIBS%%lib/julia/libsuitesparse_wrapper.so
		46	%%GPL_LIBS%%lib/julia/libsuitesparseconfig.so
		47	%%GPL_LIBS%%lib/julia/libumfpack.so
38	%%DEBUG%%lib/julia/sys-debug.so	48	%%DEBUG%%lib/julia/sys-debug.so
39	lib/julia/sys.so	49	lib/julia/sys.so
40	%%DEBUG%%lib/libjulia-debug.so	50	%%DEBUG%%lib/libjulia-debug.so
41	%%DEBUG%%lib/libjulia-debug.so.0.5	51	%%DEBUG%%lib/libjulia-debug.so.0.5
42	%%DEBUG%%lib/libjulia-debug.so.0.5.0	52	%%DEBUG%%lib/libjulia-debug.so.0.5.1
43	lib/libjulia.so	53	lib/libjulia.so
44	lib/libjulia.so.0.5	54	lib/libjulia.so.0.5
45	lib/libjulia.so.0.5.0	55	lib/libjulia.so.0.5.1
46	%%DESKTOP%%share/appdata/julia.appdata.xml	56	%%DESKTOP%%share/appdata/julia.appdata.xml
47	%%DESKTOP%%share/applications/julia.desktop	57	%%DESKTOP%%share/applications/julia.desktop
48	%%DESKTOP%%share/icons/hicolor/scalable/apps/julia.svg	58	%%DESKTOP%%share/icons/hicolor/scalable/apps/julia.svg
Lines 112-118 lib/libjulia.so.0.5.0 Link Here
112	%%DATADIR%%/base/exports.jl	122	%%DATADIR%%/base/exports.jl
113	%%DATADIR%%/base/expr.jl	123	%%DATADIR%%/base/expr.jl
114	%%DATADIR%%/base/fastmath.jl	124	%%DATADIR%%/base/fastmath.jl
115	%%DATADIR%%/base/fenv_constants.jl
116	%%DATADIR%%/base/fft/FFTW.jl	125	%%DATADIR%%/base/fft/FFTW.jl
117	%%DATADIR%%/base/fft/dct.jl	126	%%DATADIR%%/base/fft/dct.jl
118	%%DATADIR%%/base/file.jl	127	%%DATADIR%%/base/file.jl

Return to bug 217704

Lines 2-10 Link Here

(-)b/lang/julia/Makefile (-7 / +20 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= julia	4	PORTNAME= julia
5	PORTVERSION= 0.5.0	5	PORTVERSION= 0.5.1
6	DISTVERSIONSUFFIX= -full	6	DISTVERSIONSUFFIX= -full
7	PORTREVISION= 3
8	CATEGORIES= lang math	7	CATEGORIES= lang math
9	MASTER_SITES= https://github.com/JuliaLang/julia/releases/download/v${PORTVERSION}/	8	MASTER_SITES= https://github.com/JuliaLang/julia/releases/download/v${PORTVERSION}/
10		9
Lines 20-28 LIB_DEPENDS= libunwind.so:devel/libunwind \ Link Here
20	libgit2.so:devel/libgit2 \	19	libgit2.so:devel/libgit2 \
21	libgmp.so:math/gmp \	20	libgmp.so:math/gmp \
22	libmpfr.so:math/mpfr \	21	libmpfr.so:math/mpfr \
23	libpcre2-8.so:devel/pcre2 \	22	libpcre2-8.so:devel/pcre2
24	libarpack.so:math/arpack-ng	23	BUILD_DEPENDS= llvm-config39:devel/llvm39 \
25	BUILD_DEPENDS= llvm-config38:devel/llvm38 \
26	pcre2-config:devel/pcre2 \	24	pcre2-config:devel/pcre2 \
27	patchelf:sysutils/patchelf	25	patchelf:sysutils/patchelf
28		26
Lines 43-50 MAKE_ARGS+= prefix=${PREFIX} JCXXFLAGS="${CXXFLAGS}" \ Link Here
43	USE_GPL_LIBS=${USE_GPL_LIBS}	41	USE_GPL_LIBS=${USE_GPL_LIBS}
44		42
45	OPTIONS_DEFINE= EXAMPLES DEBUG DOCS GPL_LIBS DESKTOP NATIVE	43	OPTIONS_DEFINE= EXAMPLES DEBUG DOCS GPL_LIBS DESKTOP NATIVE
		44	OPTIONS_GROUP= PRIVATE
		45	OPTIONS_GROUP_PRIVATE= ARPACK
46	OPTIONS_SUB= yes	46	OPTIONS_SUB= yes
47		47
		48	PRIVATE_DESC= Build self-shipped private depends
		49
48	DEBUG_VARS= FORCE_ASSERTIONS=1 \	50	DEBUG_VARS= FORCE_ASSERTIONS=1 \
49	ALL_TARGET=all	51	ALL_TARGET=all
50		52
Lines 56-63 EXAMPLES_VARS= INSTALL_TARGET+=install-examples Link Here
56		58
57	GPL_LIBS_DESC= Build with GPL libs: FFTW and SUITESPARSE	59	GPL_LIBS_DESC= Build with GPL libs: FFTW and SUITESPARSE
58	GPL_LIBS_LIB_DEPENDS= libfftw3.so:math/fftw3 \	60	GPL_LIBS_LIB_DEPENDS= libfftw3.so:math/fftw3 \
59	libfftw3f.so:math/fftw3-float \	61	libfftw3f.so:math/fftw3-float
60	libumfpack.so:math/suitesparse
61	GPL_LIBS_VARS= USE_GPL_LIBS=1	62	GPL_LIBS_VARS= USE_GPL_LIBS=1
62		63
63	DESKTOP_DESC= Install icon, .desktop and appdata file	64	DESKTOP_DESC= Install icon, .desktop and appdata file
Lines 79-84 MAKE_ARGS+= JULIA_CPU_TARGET=generic Link Here
79	.endif	80	.endif
80	.endif	81	.endif
81		82
		83	ARPACK_DESC= Build self-shipped private arpack-ng
		84	.if ${PORT_OPTIONS:MARPACK}
		85	MAKE_ARGS+= USE_SYSTEM_ARPACK=0
		86	.else
		87	MAKE_ARGS+= USE_SYSTEM_ARPACK=1
		88	LIB_DEPENDS+= libarpack.so:math/arpack-ng
		89	.endif
		90
		91	.if ${PORT_OPTIONS:MGPL_LIBS}
		92	MAKE_ARGS+= USE_SYSTEM_SUITESPARSE=0
		93	.endif
		94
82	.if ${ARCH} == "i386"	95	.if ${ARCH} == "i386"
83	EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ui_Makefile	96	EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ui_Makefile
84	.endif	97	.endif

Lines 1-7 Link Here

(-)b/lang/julia/files/patch-Make.user (-5 / +3 lines)
1	--- Make.user.orig 2016-12-17 12:39:14 UTC	1	--- Make.user.orig 2017-02-26 09:48:03 UTC
2	+++ Make.user	2	+++ Make.user
3	@@ -0,0 +1,25 @@	3	@@ -0,0 +1,23 @@
4	+USE_SYSTEM_ARPACK= 1
5	+USE_SYSTEM_BLAS= 1	4	+USE_SYSTEM_BLAS= 1
6	+USE_SYSTEM_GMP= 1	5	+USE_SYSTEM_GMP= 1
7	+USE_SYSTEM_LAPACK= 1	6	+USE_SYSTEM_LAPACK= 1
Lines 16-25 Link Here
16	+USE_SYSTEM_PCRE= 1	15	+USE_SYSTEM_PCRE= 1
17	+USE_SYSTEM_UTF8PROC= 1	16	+USE_SYSTEM_UTF8PROC= 1
18	+	17	+
19	+LLVM_CONFIG= llvm-config38	18	+LLVM_CONFIG= llvm-config39
20	+	19	+
21	+USE_SYSTEM_FFTW= 1	20	+USE_SYSTEM_FFTW= 1
22	+USE_SYSTEM_SUITESPARSE= 1
23	+	21	+
24	+LIBBLAS= -lopenblasp -L$(LOCALBASE)/lib	22	+LIBBLAS= -lopenblasp -L$(LOCALBASE)/lib
25	+LIBBLASNAME= libopenblasp	23	+LIBBLASNAME= libopenblasp

Lines 1-6 Link Here

(-)b/lang/julia/files/patch-Makefile (-4 / +4 lines)
1	--- Makefile.orig 2016-09-20 02:54:21 UTC	1	--- Makefile.orig 2017-03-06 03:32:23 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -327,8 +327,7 @@ define stringreplace	3	@@ -328,8 +328,7 @@ define stringreplace
4	$(build_depsbindir)/stringreplace $$(strings -t x - $1 \| grep '$2' \| awk '{print $$1;}') '$3' 255 "$(call cygpath_w,$1)"	4	$(build_depsbindir)/stringreplace $$(strings -t x - $1 \| grep '$2' \| awk '{print $$1;}') '$3' 255 "$(call cygpath_w,$1)"
5	endef	5	endef
6		6
Lines 10-16 Link Here
10	@for subdir in $(bindir) $(libexecdir) $(datarootdir)/julia/site/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir); do \	10	@for subdir in $(bindir) $(libexecdir) $(datarootdir)/julia/site/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir); do \
11	mkdir -p $(DESTDIR)$$subdir; \	11	mkdir -p $(DESTDIR)$$subdir; \
12	done	12	done
13	@@ -387,10 +386,6 @@ endif	13	@@ -389,10 +388,6 @@ endif
14	$(INSTALL_M) $(JULIAHOME)/contrib/julia-config.jl $(DESTDIR)$(datarootdir)/julia/	14	$(INSTALL_M) $(JULIAHOME)/contrib/julia-config.jl $(DESTDIR)$(datarootdir)/julia/
15	# Copy in all .jl sources as well	15	# Copy in all .jl sources as well
16	cp -R -L $(build_datarootdir)/julia $(DESTDIR)$(datarootdir)/	16	cp -R -L $(build_datarootdir)/julia $(DESTDIR)$(datarootdir)/
Lines 21-27 Link Here
21	# Remove perf suite	21	# Remove perf suite
22	-rm -rf $(DESTDIR)$(datarootdir)/julia/test/perf/	22	-rm -rf $(DESTDIR)$(datarootdir)/julia/test/perf/
23	# Remove various files which should not be installed	23	# Remove various files which should not be installed
24	@@ -398,38 +393,44 @@ endif	24	@@ -400,38 +395,44 @@ endif
25	-rm -f $(DESTDIR)$(datarootdir)/julia/test/Makefile	25	-rm -f $(DESTDIR)$(datarootdir)/julia/test/Makefile
26	# Copy in beautiful new man page	26	# Copy in beautiful new man page
27	$(INSTALL_F) $(build_man1dir)/julia.1 $(DESTDIR)$(man1dir)/	27	$(INSTALL_F) $(build_man1dir)/julia.1 $(DESTDIR)$(man1dir)/