Skip to content

Commit 0eca0d3

Browse files
committed
test
1 parent e24faa5 commit 0eca0d3

File tree

4 files changed

+15
-5
lines changed

4 files changed

+15
-5
lines changed

Make.inc

+9-3
Original file line numberDiff line numberDiff line change
@@ -501,6 +501,12 @@ else
501501
build_shlibdir := $(build_libdir)
502502
endif
503503

504+
ifeq ($(OS), FreeBSD)
505+
LOCALBASE ?= /usr/local
506+
else
507+
LOCALBASE ?= /usr
508+
endif
509+
504510
ifeq (exists, $(shell [ -e $(JULIAHOME)/Make.user ] && echo exists ))
505511
include $(JULIAHOME)/Make.user
506512
endif
@@ -837,16 +843,16 @@ LIBMNAME := libopenlibm
837843
endif
838844

839845
ifeq ($(USE_SYSTEM_LIBUV), 1)
840-
LIBUV := /usr/lib/libuv-julia.a
841-
LIBUV_INC := /usr/include
846+
LIBUV := $(LOCALBASE)/lib/libuv-julia.a
847+
LIBUV_INC := $(LOCALBASE)/include
842848
else
843849
LIBUV := $(build_libdir)/libuv.a
844850
LIBUV_INC := $(build_includedir)
845851
endif
846852

847853
ifeq ($(USE_SYSTEM_UTF8PROC), 1)
848854
LIBUTF8PROC := -lutf8proc
849-
UTF8PROC_INC := /usr/include
855+
UTF8PROC_INC := $(LOCALBASE)/include
850856
else
851857
LIBUTF8PROC := $(build_libdir)/libutf8proc.a
852858
UTF8PROC_INC := $(build_includedir)

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</div>
77

88
Linux, OSX: [![Build Status](https://api.travis-ci.org/JuliaLang/julia.svg?branch=master)](https://travis-ci.org/JuliaLang/julia)
9-
9+
1010
Windows: [![Build status](https://ci.appveyor.com/api/projects/status/dvial98s5vi6ealt/branch/master?svg=true)](https://ci.appveyor.com/project/JuliaLang/julia/branch/master)
1111

1212
Code Coverage: [![Coverage Status](https://coveralls.io/repos/JuliaLang/julia/badge.svg?branch=master)](https://coveralls.io/r/JuliaLang/julia?branch=master) [![codecov.io](http://codecov.io/github/JuliaLang/julia/coverage.svg?branch=master)](http://codecov.io/github/JuliaLang/julia?branch=master)

deps/suitesparse.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ install-suitesparse: $(build_prefix)/manifest/suitesparse install-suitesparse-wr
101101
# SUITESPARSE WRAPPER
102102

103103
ifeq ($(USE_SYSTEM_SUITESPARSE), 1)
104-
SUITESPARSE_INC := -I /usr/include/suitesparse
104+
SUITESPARSE_INC := -I $(LOCALBASE)/include/suitesparse
105105
SUITESPARSE_LIB := -lumfpack -lcholmod -lamd -lcamd -lcolamd -lspqr
106106
else
107107
SUITESPARSE_INC := -I $(BUILDDIR)/SuiteSparse-$(SUITESPARSE_VER)/CHOLMOD/Include -I $(BUILDDIR)/SuiteSparse-$(SUITESPARSE_VER)/SuiteSparse_config -I $(BUILDDIR)/SuiteSparse-$(SUITESPARSE_VER)/SPQR/Include

src/Makefile

+4
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ else
3535
FLAGS += -DJL_BUILD_UNAME='"$(OS)"'
3636
endif
3737

38+
ifeq ($(OS),FreeBSD)
39+
FLAGS += -I$(LOCALBASE)/include
40+
endif
41+
3842
SRCS := \
3943
jltypes gf typemap ast builtins module interpreter symbol \
4044
dlload sys init task array dump toplevel jl_uv datatype \

0 commit comments

Comments
 (0)