We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent ed020a5 commit 1033668Copy full SHA for 1033668
Make.inc
@@ -91,6 +91,9 @@ else
91
JULIA_COMMIT = $(JULIA_VERSION)
92
endif
93
94
+# Whether to use GPL libraries or not.
95
+USE_GPL_LIBS ?= 1
96
+
97
# Directories where said libraries get installed to
98
prefix ?= $(abspath julia-$(JULIA_COMMIT))
99
bindir = $(prefix)/bin
base/Makefile
@@ -49,6 +49,11 @@ ifeq ($(USE_BLAS64), 1)
49
@echo "const USE_BLAS64 = true" >> $@
50
else
51
@echo "const USE_BLAS64 = false" >> $@
52
+endif
53
+ifeq ($(USE_GPL_LIBS), 1)
54
+ @echo "const USE_GPL_LIBS = true" >> $@
55
+else
56
+ @echo "const USE_GPL_LIBS = false" >> $@
57
58
@echo "const libfftw_name = \"$(LIBFFTWNAME)\"" >> $@
59
@echo "const libfftwf_name = \"$(LIBFFTWFNAME)\"" >> $@
base/basedocs.jl
@@ -321,6 +321,8 @@ keywords[:immutable] = doc"""
321
push!([1,2,3], 4) == [1,2,3,4]
322
""" push!
323
324
+if Base.USE_GPL_LIBS
325
326
@doc doc"""
327
fft(A[, dims])
328
@@ -347,6 +349,8 @@ keywords[:immutable] = doc"""
347
349
processors.
348
350
""" fft
351
352
+end # USE_GPL_LIBS
353
354
355
include("file.jl")
356
base/sparse.jl
@@ -20,8 +20,10 @@ include("sparse/sparsematrix.jl")
20
include("sparse/csparse.jl")
21
22
include("sparse/linalg.jl")
23
-include("sparse/umfpack.jl")
24
-include("sparse/cholmod.jl")
25
-include("sparse/spqr.jl")
+ include("sparse/umfpack.jl")
+ include("sparse/cholmod.jl")
26
+ include("sparse/spqr.jl")
27
+end
28
29
end # module SparseMatrix
base/sysimg.jl
@@ -261,9 +261,11 @@ include("sparse.jl")
261
importall .SparseMatrix
262
263
# signal processing
264
-include("fftw.jl")
265
-include("dsp.jl")
266
-importall .DSP
+if USE_GPL_LIBS
+ include("fftw.jl")
+ include("dsp.jl")
267
+ importall .DSP
268
269
270
# system information
271
include("sysinfo.jl")
deps/Makefile
@@ -61,9 +61,15 @@ MAKE_COMMON = DESTDIR="" prefix=$(build_prefix) bindir=$(build_bindir) libdir=$(
61
# prevent installing libs into usr/lib64 on opensuse
62
unexport CONFIG_SITE
63
64
65
STAGE1_DEPS =
66
STAGE2_DEPS = Rmath-julia
67
STAGE3_DEPS = suitesparse-wrapper
68
69
+STAGE1_DEPS =
70
+STAGE2_DEPS =
71
+STAGE3_DEPS =
72
73
74
ifeq ($(USE_SYSTEM_LIBUV), 0)
75
STAGE1_DEPS += libuv
@@ -121,9 +127,11 @@ endif
121
127
122
128
123
129
130
124
131
ifeq ($(USE_SYSTEM_FFTW), 0)
125
132
STAGE1_DEPS += fftw
126
133
134
135
136
ifeq ($(USE_SYSTEM_GMP), 0)
137
STAGE1_DEPS += gmp
@@ -149,9 +157,11 @@ ifeq ($(USE_SYSTEM_ARPACK), 0)
149
157
STAGE2_DEPS += arpack
150
158
151
159
160
152
161
ifeq ($(USE_SYSTEM_SUITESPARSE), 0)
153
162
STAGE2_DEPS += suitesparse
154
163
164
155
165
156
166
ifeq ($(USE_SYSTEM_UTF8PROC), 0)
167
STAGE2_DEPS += utf8proc
test/choosetests.jl
@@ -16,7 +16,7 @@ function choosetests(choices = [])
16
"linalg", "core", "keywordargs", "numbers", "strings",
17
"dates", "dict", "hashing", "remote", "iobuffer", "staged",
18
"arrayops", "tuple", "subarray", "reduce", "reducedim", "random",
19
- "intfuncs", "simdloop", "blas", "fft", "dsp", "sparse",
+ "intfuncs", "simdloop", "blas", "sparse",
"bitarray", "copy", "math", "fastmath", "functional",
"operators", "path", "ccall",
"bigint", "sorting", "statistics", "spawn", "backtrace",
@@ -31,6 +31,10 @@ function choosetests(choices = [])
31
"enums", "cmdlineargs", "i18n"
32
]
33
34
+ if Base.USE_GPL_LIBS
35
+ testnames = [testnames, "fft", "dsp"; ]
36
+ end
37
38
if isdir(joinpath(JULIA_HOME, Base.DOCDIR, "examples"))
39
push!(testnames, "examples")
40
end
test/sparse.jl
@@ -1,4 +1,6 @@
1
include("sparsedir/sparse.jl")
2
-include("sparsedir/umfpack.jl")
3
-include("sparsedir/cholmod.jl")
4
-include("sparsedir/spqr.jl")
+ include("sparsedir/umfpack.jl")
+ include("sparsedir/cholmod.jl")
5
+ include("sparsedir/spqr.jl")
6
0 commit comments