summaryrefslogtreecommitdiff
path: root/lang/julia/files
diff options
context:
space:
mode:
Diffstat (limited to 'lang/julia/files')
-rw-r--r--lang/julia/files/patch-Make.inc23
-rw-r--r--lang/julia/files/patch-Make.user11
-rw-r--r--lang/julia/files/patch-Makefile40
-rw-r--r--lang/julia/files/patch-base_Terminals.jl11
-rw-r--r--lang/julia/files/patch-base_libdl.jl48
-rw-r--r--lang/julia/files/patch-base_mmap.jl11
-rw-r--r--lang/julia/files/patch-base_sharedarray.jl17
-rw-r--r--lang/julia/files/patch-base_socket.jl11
-rw-r--r--lang/julia/files/patch-deps_suitesparse.mk11
-rw-r--r--lang/julia/files/patch-src_Makefile42
-rw-r--r--lang/julia/files/patch-ui_Makefile17
11 files changed, 50 insertions, 192 deletions
diff --git a/lang/julia/files/patch-Make.inc b/lang/julia/files/patch-Make.inc
index bbf92669da90..02ab1cacf125 100644
--- a/lang/julia/files/patch-Make.inc
+++ b/lang/julia/files/patch-Make.inc
@@ -1,6 +1,6 @@
---- Make.inc.orig 2017-05-08 07:00:02 UTC
+--- Make.inc.orig 2017-06-19 17:48:45 UTC
+++ Make.inc
-@@ -128,12 +128,7 @@ endif
+@@ -133,12 +133,7 @@ endif
# disable automatic Makefile rules
.SUFFIXES:
@@ -13,7 +13,7 @@
# Julia's Semantic Versioning system labels the three decimal places in a version number as
# the major, minor and patch versions. Typically the major version would be incremented
-@@ -178,7 +173,7 @@ libdir := $(prefix)/lib
+@@ -183,7 +178,7 @@ libdir := $(prefix)/lib
libexecdir := $(prefix)/libexec
datarootdir := $(prefix)/share
docdir := $(datarootdir)/doc/julia
@@ -22,7 +22,7 @@
man1dir := $(mandir)/man1
includedir := $(prefix)/include
sysconfdir := $(prefix)/etc
-@@ -192,7 +187,7 @@ build_libdir := $(build_prefix)/lib
+@@ -197,7 +192,7 @@ build_libdir := $(build_prefix)/lib
build_libexecdir := $(build_prefix)/libexec
build_datarootdir := $(build_prefix)/share
build_docdir := $(build_datarootdir)/doc/julia
@@ -31,7 +31,7 @@
build_man1dir := $(build_mandir)/man1
build_includedir := $(build_prefix)/include
build_sysconfdir := $(build_prefix)/etc
-@@ -340,7 +335,7 @@ endif
+@@ -350,7 +345,7 @@ endif
ifeq ($(USEIFC), 1)
FC := ifort
else
@@ -40,7 +40,7 @@
endif
STDLIBCPP_FLAG :=
-@@ -393,14 +388,14 @@ SHIPFLAGS := -O3 -ggdb2 -falign-functions
+@@ -403,14 +398,14 @@ SHIPFLAGS := -O3 -ggdb2 -falign-functions
endif
ifeq ($(USECLANG),1)
@@ -57,13 +57,4 @@
+SHIPFLAGS := -O3
ifeq ($(OS), Darwin)
ifeq ($(USE_LIBCPP), 1)
- CC += -stdlib=libc++ -mmacosx-version-min=10.7
-@@ -833,7 +828,7 @@ endif
-
- ifeq ($(USE_SYSTEM_UTF8PROC), 1)
- LIBUTF8PROC := -lutf8proc
-- UTF8PROC_INC := /usr/include
-+ UTF8PROC_INC := $(LOCALBASE)/include
- else
- LIBUTF8PROC := $(build_libdir)/libutf8proc.a
- UTF8PROC_INC := $(build_includedir)
+ MACOSX_VERSION_MIN := 10.8
diff --git a/lang/julia/files/patch-Make.user b/lang/julia/files/patch-Make.user
index b5af34508718..5e1f2d447c67 100644
--- a/lang/julia/files/patch-Make.user
+++ b/lang/julia/files/patch-Make.user
@@ -1,24 +1,21 @@
---- Make.user.orig 2017-02-26 09:48:03 UTC
+--- Make.user.orig 2017-07-01 17:24:48 UTC
+++ Make.user
-@@ -0,0 +1,23 @@
+@@ -0,0 +1,20 @@
+USE_SYSTEM_BLAS= 1
+USE_SYSTEM_GMP= 1
+USE_SYSTEM_LAPACK= 1
+USE_SYSTEM_LIBGIT2= 1
-+USE_SYSTEM_LIBM= 1
+USE_SYSTEM_LIBUNWIND= 1
+USE_SYSTEM_LIBUV= 0
+USE_SYSTEM_LLVM= 1
+USE_SYSTEM_MPFR= 1
-+# USE_SYSTEM_OPENLIBM= 0
+USE_SYSTEM_PATCHELF= 1
+USE_SYSTEM_PCRE= 1
+USE_SYSTEM_UTF8PROC= 1
-+
-+LLVM_CONFIG= llvm-config39
-+
+USE_SYSTEM_FFTW= 1
+
++LLVM_CONFIG= llvm-config40
++
+LIBBLAS= -lopenblasp -L$(LOCALBASE)/lib
+LIBBLASNAME= libopenblasp
+
diff --git a/lang/julia/files/patch-Makefile b/lang/julia/files/patch-Makefile
index 29ecc13e278a..f8824c92ce41 100644
--- a/lang/julia/files/patch-Makefile
+++ b/lang/julia/files/patch-Makefile
@@ -1,38 +1,42 @@
---- Makefile.orig 2017-05-08 07:00:02 UTC
+--- Makefile.orig 2017-06-19 17:48:45 UTC
+++ Makefile
-@@ -63,11 +63,6 @@ CLEAN_TARGETS += clean-docdir
- clean-docdir:
- @-rm -fr $(abspath $(build_docdir))
- $(build_prefix)/.examples: $(wildcard $(JULIAHOME)/examples/*.jl) $(shell find $(JULIAHOME)/examples/clustermanager)
-- @echo Copying in usr/share/doc/julia/examples
-- @-rm -fr $(build_docdir)/examples
-- @mkdir -p $(build_docdir)/examples
-- @cp -R $(JULIAHOME)/examples/*.jl $(build_docdir)/examples/
-- @cp -R $(JULIAHOME)/examples/clustermanager $(build_docdir)/examples/
+@@ -71,7 +71,6 @@ $(build_prefix)/.examples: $(wildcard $(
+ @mkdir -p $(build_docdir)/examples
+ @cp -R $(JULIAHOME)/examples/*.jl $(build_docdir)/examples/
+ @cp -R $(JULIAHOME)/examples/clustermanager $(build_docdir)/examples/
+- @cp -R $(JULIAHOME)/examples/embedding $(build_docdir)/examples
@echo 1 > $@
julia-symlink: julia-ui-$(JULIA_BUILD_MODE)
-@@ -328,7 +323,7 @@ define stringreplace
+@@ -96,7 +95,7 @@ julia-src-release julia-src-debug : juli
+ julia-ui-release julia-ui-debug : julia-ui-% : julia-src-%
+ @$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT)/ui julia-$*
+
+-julia-inference : julia-base julia-ui-$(JULIA_BUILD_MODE) $(build_prefix)/.examples
++julia-inference : julia-base julia-ui-$(JULIA_BUILD_MODE)
+ @$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT) $(build_private_libdir)/inference.ji JULIA_BUILD_MODE=$(JULIA_BUILD_MODE)
+
+ ifneq ($(CPUID_SPECIFIC_BINARIES), 0)
+@@ -332,7 +331,7 @@ define stringreplace
$(build_depsbindir)/stringreplace $$(strings -t x - $1 | grep '$2' | awk '{print $$1;}') '$3' 255 "$(call cygpath_w,$1)"
endef
--install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html
+-install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html
+install: $(build_depsbindir)/stringreplace
@$(MAKE) $(QUIET_MAKE) all
- @for subdir in $(bindir) $(libexecdir) $(datarootdir)/julia/site/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir); do \
+ @for subdir in $(bindir) $(datarootdir)/julia/site/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir); do \
mkdir -p $(DESTDIR)$$subdir; \
-@@ -389,10 +384,6 @@ endif
- $(INSTALL_M) $(JULIAHOME)/contrib/julia-config.jl $(DESTDIR)$(datarootdir)/julia/
+@@ -377,9 +376,6 @@ endif
+ $(INSTALL_M) $(JULIAHOME)/contrib/build_sysimg.jl $(DESTDIR)$(datarootdir)/julia/
# Copy in all .jl sources as well
cp -R -L $(build_datarootdir)/julia $(DESTDIR)$(datarootdir)/
- # Copy documentation
- cp -R -L $(build_docdir)/* $(DESTDIR)$(docdir)/
- cp -R -L $(BUILDROOT)/doc/_build/html $(DESTDIR)$(docdir)/
-- -rm $(DESTDIR)$(docdir)/html/.buildinfo
# Remove perf suite
-rm -rf $(DESTDIR)$(datarootdir)/julia/test/perf/
# Remove various files which should not be installed
-@@ -400,38 +391,44 @@ endif
+@@ -387,38 +383,44 @@ endif
-rm -f $(DESTDIR)$(datarootdir)/julia/test/Makefile
# Copy in beautiful new man page
$(INSTALL_F) $(build_man1dir)/julia.1 $(DESTDIR)$(man1dir)/
@@ -72,8 +76,8 @@
cp -R $(build_sysconfdir)/julia $(DESTDIR)$(sysconfdir)/
+install-docs:
++ # Copy documentation
+ cp -R -L $(BUILDROOT)/doc/_build/html $(DESTDIR)$(docdir)/
-+ rm $(DESTDIR)$(docdir)/html/.buildinfo
+
+install-examples:
+ mkdir -p $(DESTDIR)$(datarootdir)/examples/julia/
diff --git a/lang/julia/files/patch-base_Terminals.jl b/lang/julia/files/patch-base_Terminals.jl
deleted file mode 100644
index 618c31b7f1fe..000000000000
--- a/lang/julia/files/patch-base_Terminals.jl
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/Terminals.jl.orig 2017-02-19 14:49:03 UTC
-+++ base/Terminals.jl
-@@ -156,7 +156,7 @@ else
- function hascolor(t::TTYTerminal)
- startswith(t.term_type, "xterm") && return true
- try
-- return success(`tput setaf 0`)
-+ return success(`tput AF 0`)
- catch
- return false
- end
diff --git a/lang/julia/files/patch-base_libdl.jl b/lang/julia/files/patch-base_libdl.jl
deleted file mode 100644
index 72e208a35dd9..000000000000
--- a/lang/julia/files/patch-base_libdl.jl
+++ /dev/null
@@ -1,48 +0,0 @@
---- base/libdl.jl.orig 2016-09-20 02:54:21 UTC
-+++ base/libdl.jl
-@@ -198,6 +198,31 @@ if is_linux()
- end
- end # linux-only
-
-+if is_bsd() && !is_apple()
-+ # DL_ITERATE_PHDR(3) on freebsd
-+ immutable dl_phdr_info
-+ # Base address of object
-+ addr::Cuint
-+
-+ # Null-terminated name of object
-+ name::Ptr{UInt8}
-+
-+ # Pointer to array of ELF program headers for this object
-+ phdr::Ptr{Void}
-+
-+ # Number of program headers for this object
-+ phnum::Cshort
-+ end
-+
-+ function dl_phdr_info_callback(di::dl_phdr_info, size::Csize_t, dy_libs::Array{AbstractString,1})
-+ name = unsafe_string(di.name)
-+ if !isempty(name)
-+ push!(dy_libs, name)
-+ end
-+ return convert(Cint, 0)::Cint
-+ end
-+end # bsd family
-+
- function dllist()
- dynamic_libraries = Array{AbstractString}(0)
-
-@@ -221,6 +246,13 @@ function dllist()
- ccall(:jl_dllist, Cint, (Any,), dynamic_libraries)
- end
-
-+ @static if is_bsd() && !is_apple()
-+ const callback = cfunction(dl_phdr_info_callback, Cint,
-+ (Ref{dl_phdr_info}, Csize_t, Ref{Array{AbstractString,1}} ))
-+ ccall(:dl_iterate_phdr, Cint, (Ptr{Void}, Ref{Array{AbstractString,1}}), callback, dynamic_libraries)
-+ shift!(dynamic_libraries)
-+ end
-+
- return dynamic_libraries
- end
-
diff --git a/lang/julia/files/patch-base_mmap.jl b/lang/julia/files/patch-base_mmap.jl
deleted file mode 100644
index 1eefb32d88ab..000000000000
--- a/lang/julia/files/patch-base_mmap.jl
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/mmap.jl.orig 2017-02-23 09:50:38 UTC
-+++ base/mmap.jl
-@@ -27,7 +27,7 @@ const PROT_READ = Cint(1)
- const PROT_WRITE = Cint(2)
- const MAP_SHARED = Cint(1)
- const MAP_PRIVATE = Cint(2)
--const MAP_ANONYMOUS = Cint(is_apple() ? 0x1000 : 0x20)
-+const MAP_ANONYMOUS = Cint(0x1000)
- const F_GETFL = Cint(3)
-
- gethandle(io::IO) = fd(io)
diff --git a/lang/julia/files/patch-base_sharedarray.jl b/lang/julia/files/patch-base_sharedarray.jl
deleted file mode 100644
index 81da304186d8..000000000000
--- a/lang/julia/files/patch-base_sharedarray.jl
+++ /dev/null
@@ -1,17 +0,0 @@
---- base/sharedarray.jl.orig 2017-02-23 09:55:38 UTC
-+++ base/sharedarray.jl
-@@ -477,13 +477,7 @@ complex(S1::SharedArray,S2::SharedArray)
-
- function print_shmem_limits(slen)
- try
-- if is_linux()
-- pfx = "kernel"
-- elseif is_apple()
-- pfx = "kern.sysv"
-- else
-- return
-- end
-+ pfx = "kern.ipc"
-
- shmmax_MB = div(parse(Int, split(readstring(`sysctl $(pfx).shmmax`))[end]), 1024*1024)
- page_size = parse(Int, split(readstring(`getconf PAGE_SIZE`))[end])
diff --git a/lang/julia/files/patch-base_socket.jl b/lang/julia/files/patch-base_socket.jl
deleted file mode 100644
index e57755988392..000000000000
--- a/lang/julia/files/patch-base_socket.jl
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/socket.jl.orig 2017-02-24 09:57:14 UTC
-+++ base/socket.jl
-@@ -762,7 +762,7 @@ function getsockname(sock::Union{TCPServ
- addrv4 = raddress[1:4]
- naddr = ntoh(unsafe_load(Ptr{Cuint}(pointer(addrv4)), 1))
- addr = IPv4(naddr)
-- elseif rfamily[] == @static is_windows() ? 23 : (@static is_apple() ? 30 : 10) # AF_INET6
-+ elseif rfamily[] == 28 # AF_INET6
- naddr = ntoh(unsafe_load(Ptr{UInt128}(pointer(raddress)), 1))
- addr = IPv6(naddr)
- else
diff --git a/lang/julia/files/patch-deps_suitesparse.mk b/lang/julia/files/patch-deps_suitesparse.mk
deleted file mode 100644
index 31a04009761d..000000000000
--- a/lang/julia/files/patch-deps_suitesparse.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- deps/suitesparse.mk.orig 2016-09-20 02:54:21 UTC
-+++ deps/suitesparse.mk
-@@ -93,7 +93,7 @@ install-suitesparse: $(SUITESPARSE_OBJ_T
- # SUITESPARSE WRAPPER
-
- ifeq ($(USE_SYSTEM_SUITESPARSE), 1)
--SUITESPARSE_INC := -I /usr/include/suitesparse
-+SUITESPARSE_INC := -I $(LOCALBASE)/include/suitesparse
- SUITESPARSE_LIB := -lumfpack -lcholmod -lamd -lcamd -lcolamd -lspqr
- else
- SUITESPARSE_INC := -I $(BUILDDIR)/SuiteSparse-$(SUITESPARSE_VER)/CHOLMOD/Include -I $(BUILDDIR)/SuiteSparse-$(SUITESPARSE_VER)/SuiteSparse_config -I $(BUILDDIR)/SuiteSparse-$(SUITESPARSE_VER)/SPQR/Include
diff --git a/lang/julia/files/patch-src_Makefile b/lang/julia/files/patch-src_Makefile
index 1afb292e5b6c..6f886938a328 100644
--- a/lang/julia/files/patch-src_Makefile
+++ b/lang/julia/files/patch-src_Makefile
@@ -1,28 +1,20 @@
---- src/Makefile.orig 2017-03-06 03:32:23 UTC
+--- src/Makefile.orig 2017-06-19 17:48:45 UTC
+++ src/Makefile
-@@ -9,7 +9,7 @@ override CFLAGS += $(JCFLAGS)
- ifeq ($(LLVM_VER),3.3)
- override CXXFLAGS += $(JCXXFLAGS) -std=c++11
- else
--override CXXFLAGS += $(JCXXFLAGS)
-+override CXXFLAGS += $(JCXXFLAGS) -stdlib=libc++ -std=c++11
+@@ -263,7 +263,7 @@ else
endif
- override CPPFLAGS += $(JCPPFLAGS)
-@@ -21,6 +21,7 @@ FLAGS := \
- -D_GNU_SOURCE -I$(BUILDDIR) -I$(SRCDIR) \
- -I$(SRCDIR)/flisp -I$(SRCDIR)/support \
- -I$(LIBUV_INC) -I$(build_includedir) -DLIBRARY_EXPORTS \
-+ -I$(LOCALBASE)/include \
- -I$(JULIAHOME)/deps/valgrind
- ifneq ($(USEMSVC), 1)
- FLAGS += -Wall -Wno-strict-aliasing -fno-omit-frame-pointer -fvisibility=hidden -fno-common \
-@@ -76,7 +77,7 @@ else
- ifeq ($(OS),WINNT)
- LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(LLVM_VER_SHORT)
- else
--LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(shell $(LLVM_CONFIG_HOST) --version)
-+LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags --libs)
- endif # OS == WINNT
- endif # LLVM_USE_CMAKE == 1
- FLAGS += -DLLVM_SHLIB
+ $(build_shlibdir)/libjulia-debug.$(JL_MAJOR_MINOR_SHLIB_EXT): $(SRCDIR)/julia.expmap $(DOBJS) $(BUILDDIR)/flisp/libflisp-debug.a $(BUILDDIR)/support/libsupport-debug.a $(LIBUV)
+- @$(call PRINT_LINK, $(CXXLD) $(CXXFLAGS) $(CXXLDFLAGS) $(DEBUGFLAGS) $(DOBJS) $(RPATH_LIB) -o $@ $(LDFLAGS) $(JLIBLDFLAGS) $(DEBUG_LIBS) $(SONAME_DEBUG))
++ @$(call PRINT_LINK, $(CXXLD) $(CXXFLAGS) $(CXXLDFLAGS) $(DEBUGFLAGS) $(DOBJS) $(RPATH_LIB) -o $@ $(LDFLAGS) $(JLIBLDFLAGS) $(DEBUG_LIBS) $(SONAME_DEBUG)) -lgcc_s
+ $(INSTALL_NAME_CMD)libjulia-debug.$(SHLIB_EXT) $@
+ ifneq ($(OS), WINNT)
+ @ln -sf libjulia-debug.$(JL_MAJOR_MINOR_SHLIB_EXT) $(build_shlibdir)/libjulia-debug.$(JL_MAJOR_SHLIB_EXT)
+@@ -278,7 +278,7 @@ $(BUILDDIR)/libjulia-debug.a: $(SRCDIR)/
+ libjulia-debug: $(build_shlibdir)/libjulia-debug.$(JL_MAJOR_MINOR_SHLIB_EXT) $(PUBLIC_HEADER_TARGETS)
+
+ $(build_shlibdir)/libjulia.$(JL_MAJOR_MINOR_SHLIB_EXT): $(SRCDIR)/julia.expmap $(OBJS) $(BUILDDIR)/flisp/libflisp.a $(BUILDDIR)/support/libsupport.a $(LIBUV)
+- @$(call PRINT_LINK, $(CXXLD) $(CXXFLAGS) $(CXXLDFLAGS) $(SHIPFLAGS) $(OBJS) $(RPATH_LIB) -o $@ $(LDFLAGS) $(JLIBLDFLAGS) $(RELEASE_LIBS) $(SONAME))
++ @$(call PRINT_LINK, $(CXXLD) $(CXXFLAGS) $(CXXLDFLAGS) $(SHIPFLAGS) $(OBJS) $(RPATH_LIB) -o $@ $(LDFLAGS) $(JLIBLDFLAGS) $(RELEASE_LIBS) $(SONAME)) -lgcc_s
+ $(INSTALL_NAME_CMD)libjulia.$(SHLIB_EXT) $@
+ ifneq ($(OS), WINNT)
+ @ln -sf libjulia.$(JL_MAJOR_MINOR_SHLIB_EXT) $(build_shlibdir)/libjulia.$(JL_MAJOR_SHLIB_EXT)
diff --git a/lang/julia/files/patch-ui_Makefile b/lang/julia/files/patch-ui_Makefile
deleted file mode 100644
index e6878e287919..000000000000
--- a/lang/julia/files/patch-ui_Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
---- ui/Makefile.orig 2016-09-20 02:54:22 UTC
-+++ ui/Makefile
-@@ -66,10 +66,12 @@ else
- CXXLD := $(LD)
- endif
-
-+LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags --system-libs)
-+
- $(build_bindir)/julia$(EXE): $(OBJS)
-- @$(call PRINT_LINK, $(CXXLD) $(CXXFLAGS) $(CXXLDFLAGS) $(LINK_FLAGS) $(SHIPFLAGS) $^ -o $@ -L$(build_private_libdir) -L$(build_libdir) -L$(build_shlibdir) -ljulia $(JLDFLAGS) $(CXXLDFLAGS))
-+ @$(call PRINT_LINK, $(CXXLD) -v $(CXXFLAGS) $(CXXLDFLAGS) $(LINK_FLAGS) $(SHIPFLAGS) $^ -o $@ -L$(build_private_libdir) -L$(build_libdir) -L$(build_shlibdir) -ljulia $(JLDFLAGS) $(CXXLDFLAGS) $(LLVMLINK))
- $(build_bindir)/julia-debug$(EXE): $(DOBJS)
-- @$(call PRINT_LINK, $(CXXLD) $(CXXFLAGS) $(CXXLDFLAGS) $(LINK_FLAGS) $(DEBUGFLAGS) $^ -o $@ -L$(build_private_libdir) -L$(build_libdir) -L$(build_shlibdir) -ljulia-debug $(JLDFLAGS) $(CXXLDFLAGS))
-+ @$(call PRINT_LINK, $(CXXLD) $(CXXFLAGS) $(CXXLDFLAGS) $(LINK_FLAGS) $(DEBUGFLAGS) $^ -o $@ -L$(build_private_libdir) -L$(build_libdir) -L$(build_shlibdir) -ljulia-debug $(JLDFLAGS) $(CXXLDFLAGS) $(LLVMLINK))
-
- clean: | $(CLEAN_TARGETS)
- rm -f *.o *.dbg.obj
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-31 06:44:29 +0000