Date: Mon, 27 Feb 2017 13:44:30 +0000 (UTC) From: Li-Wen Hsu <lwhsu@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r434936 - in head/lang/julia: . files Message-ID: <201702271344.v1RDiUfl093063@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lwhsu Date: Mon Feb 27 13:44:30 2017 New Revision: 434936 URL: https://svnweb.freebsd.org/changeset/ports/434936 Log: - Backport FreeBSD only patches PR: 217320 Submitted by: Iblis Lin <iblis@hs.ntnu.edu.tw> (maintainer) Added: head/lang/julia/files/patch-base_Terminals.jl (contents, props changed) head/lang/julia/files/patch-base_libdl.jl (contents, props changed) head/lang/julia/files/patch-base_mmap.jl (contents, props changed) head/lang/julia/files/patch-base_sharedarray.jl (contents, props changed) head/lang/julia/files/patch-base_socket.jl (contents, props changed) Modified: head/lang/julia/Makefile Modified: head/lang/julia/Makefile ============================================================================== --- head/lang/julia/Makefile Mon Feb 27 13:08:07 2017 (r434935) +++ head/lang/julia/Makefile Mon Feb 27 13:44:30 2017 (r434936) @@ -4,7 +4,7 @@ PORTNAME= julia PORTVERSION= 0.5.0 DISTVERSIONSUFFIX= -full -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang math MASTER_SITES= https://github.com/JuliaLang/julia/releases/download/v${PORTVERSION}/ Added: head/lang/julia/files/patch-base_Terminals.jl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/julia/files/patch-base_Terminals.jl Mon Feb 27 13:44:30 2017 (r434936) @@ -0,0 +1,11 @@ +--- 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 Added: head/lang/julia/files/patch-base_libdl.jl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/julia/files/patch-base_libdl.jl Mon Feb 27 13:44:30 2017 (r434936) @@ -0,0 +1,48 @@ +--- 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 + Added: head/lang/julia/files/patch-base_mmap.jl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/julia/files/patch-base_mmap.jl Mon Feb 27 13:44:30 2017 (r434936) @@ -0,0 +1,11 @@ +--- 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) Added: head/lang/julia/files/patch-base_sharedarray.jl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/julia/files/patch-base_sharedarray.jl Mon Feb 27 13:44:30 2017 (r434936) @@ -0,0 +1,17 @@ +--- 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]) Added: head/lang/julia/files/patch-base_socket.jl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/julia/files/patch-base_socket.jl Mon Feb 27 13:44:30 2017 (r434936) @@ -0,0 +1,11 @@ +--- 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702271344.v1RDiUfl093063>