diff options
Diffstat (limited to 'lang/julia/files')
-rw-r--r-- | lang/julia/files/patch-Make.user | 8 | ||||
-rw-r--r-- | lang/julia/files/patch-Makefile | 8 | ||||
-rw-r--r-- | lang/julia/files/patch-src_Makefile | 4 |
3 files changed, 9 insertions, 11 deletions
diff --git a/lang/julia/files/patch-Make.user b/lang/julia/files/patch-Make.user index c6c9c0f78f64..b5af34508718 100644 --- a/lang/julia/files/patch-Make.user +++ b/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 diff --git a/lang/julia/files/patch-Makefile b/lang/julia/files/patch-Makefile index 4154f3dacf91..91e7e3bdf5a0 100644 --- a/lang/julia/files/patch-Makefile +++ b/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)/ diff --git a/lang/julia/files/patch-src_Makefile b/lang/julia/files/patch-src_Makefile index 4cc45173e9a6..1afb292e5b6c 100644 --- a/lang/julia/files/patch-src_Makefile +++ b/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 |