Gentoo Archives: gentoo-commits

From: Matthias Maier <tamiko@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/, dev-lang/julia/files/
Date: Tue, 04 Sep 2018 01:20:19
Message-Id: 1536023992.f5e9b648beabb30f0eefb2bf9ce72e3a8e89a927.tamiko@gentoo
1 commit: f5e9b648beabb30f0eefb2bf9ce72e3a8e89a927
2 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 3 22:21:33 2018 +0000
4 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 4 01:19:52 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5e9b648
7
8 dev-lang/julia: Update ebuild
9
10 Closes: https://github.com/gentoo/gentoo/pull/9553
11 Package-Manager: Portage-2.3.48, Repoman-2.3.10
12
13 dev-lang/julia/Manifest | 5 +-
14 ...em.patch => julia-0.7.0-fix_build_system.patch} | 27 ++++--
15 .../julia/files/julia-1.0.0-fix_build_system.patch | 27 ++++--
16 dev-lang/julia/julia-1.0.0.ebuild | 96 +++++++++++-----------
17 4 files changed, 90 insertions(+), 65 deletions(-)
18
19 diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
20 index 88b87cdcf4b..04afe500355 100644
21 --- a/dev-lang/julia/Manifest
22 +++ b/dev-lang/julia/Manifest
23 @@ -1,4 +1,7 @@
24 DIST julia-0.6.3-bundled.tar.gz 2099258 BLAKE2B dea1f5d37477e0a612e3901d7d568e8c4b350496f9d2b344cd7e2c2043ae30b4dd26b567803a2cb96d1ec4dbe2ba514fb08b925c695589746691887334330dd2 SHA512 d04cd55ba0dde08f253db3a388cf5ebe87cec8ae321a5af4c1c92f2680aa6e6ef2ebfa771ec74f8f1ff96409e2c0645476acf577859e8718eac4a581f097639d
25 DIST julia-0.6.3.tar.gz 5542642 BLAKE2B cccd1ee2eb4d9f59382a0d1f6466e77c84b0542456c405c05b718bc8a39ff537a09760a523ee572fc9eee6797158aa00010fc4c931a80deac645fb1e45061c87 SHA512 f529bb30a17989234061cf4c3d87aecc6da720eb494efaca7be4ec1ed5eda60d440896fb76a45b6cb30205030256e7de765e8944f873b31d96f7c9ecac542db8
26 -DIST julia-1.0.0-bundled.tar.gz 3740215 BLAKE2B 1d230d9f2ba47a1ee3221d1a4c94648bd02a80c30205dd9d438f78261e005ab7ed2173a3c7673489b17ee50050a4cbc0563ce90f16202b8cea65e4c65155cf2c SHA512 be89442366e0ebc789c16485b790368ef8702375bc1c1520d33bda152c8eda988a87f0a389d9b060f51b00ad0c249a95149468ab296811cd7050e110368d256a
27 DIST julia-1.0.0.tar.gz 7378753 BLAKE2B 1fcf3a63b00b6a49a86ca69b6ee809a28c828287c739405ae180e96645d565de0941b049d319f82f60e1ee63ee89629be213ecb22ab1ea901b306d1e149fa861 SHA512 5a53b16a1ab57cdffa5dadf11e78c413ed9f18af23ae90b64dee8323c2fc9bd6e6918b341f48accbcb7a6eab559811c80d72ac3ac0576c7cf6c9c9057356f6ba
28 +DIST julia-dsfmt-2.2.3.tar.gz 291773 BLAKE2B 6ffae90494d72527920c80fc0fb005da1c7b84f8a03a7ecb0789434c0fff97359e5098e85431896dffccc7d5148c414e847aaba5feef648b8788421a466ff65e SHA512 6d8ddcd01aab3f9039f4f0288a8af53e290cc2f293ed8c4a8c9f3b3f12398e7eedfce8016117b425766ba89c61c86c13b3e420035b5f9bf91315b8b814c03662
29 +DIST julia-libuv-ed3700c849289ed01fe04273a7bf865340b2bd7e.tar.gz 1492695 BLAKE2B ad03512dd1db2c7066b46b5a3a314645b925481d8ace09ac0a0ae23cf5b8a64338ad457f8df229aa82f1d45605b5366883f563f2e22756ce28bb6fb7607d7124 SHA512 1305035b1372bdf234e3c5e673ee4c8ab5bda83ff06bc27704786def52667c3143fe587fca8f6e0855ba0c8b6d4dd90b2faefd33736224173f459d751885683e
30 +DIST julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz 4183 BLAKE2B c932e23b1b476d3fd16cf6f451efd5fc6d9c1ec2c53e8ac086340a100817d9b30dae3eff50b284a42c09b2bbae30b9e2fd38b2881f8cbf4974a89f3bd0c87599 SHA512 6fb77b715d70d9bc95a8546c3bf97bd3677c7ea344b88bb5bc3bbfac9dceabe8a8cde7a0f64dec884cde802e4a3000e30837d3f824b5a9242348c4fe061526a3
31 +DIST julia-utf8proc-97ef668b312b96382714dbb8eaac4affce0816e6.tar.gz 156361 BLAKE2B e5e1485b758e959ed78f7fde8b211376da2365e5835708042de57c091b10b59755e1203a9f88c0d761687bf3d166207410de6ec203d80fef4dbdf06a50404cd1 SHA512 1c80dc6e71fdad187b142d02e561dfe1880857baaec08d36240ecb2f275d1bc5467aace84eebe5a10fd3f4c40b0035e65a5db3ec2a9ee6940920b0aad6221c55
32
33 diff --git a/dev-lang/julia/files/julia-1.0.0-fix_build_system.patch b/dev-lang/julia/files/julia-0.7.0-fix_build_system.patch
34 similarity index 80%
35 copy from dev-lang/julia/files/julia-1.0.0-fix_build_system.patch
36 copy to dev-lang/julia/files/julia-0.7.0-fix_build_system.patch
37 index 1ed19d6e06e..028a2f7e08c 100644
38 --- a/dev-lang/julia/files/julia-1.0.0-fix_build_system.patch
39 +++ b/dev-lang/julia/files/julia-0.7.0-fix_build_system.patch
40 @@ -1,8 +1,8 @@
41 diff --git a/Make.inc b/Make.inc
42 -index 8e0df61..5747a1c 100644
43 +index 8cb2c1014..d3be9de8e 100644
44 --- a/Make.inc
45 +++ b/Make.inc
46 -@@ -181,7 +181,7 @@ USE_GPL_LIBS ?= 1
47 +@@ -178,7 +178,7 @@ USE_GPL_LIBS ?= 1
48 # Directories where said libraries get installed to
49 prefix ?= $(BUILDROOT)/julia-$(JULIA_COMMIT)
50 bindir := $(prefix)/bin
51 @@ -11,7 +11,7 @@ index 8e0df61..5747a1c 100644
52 libexecdir := $(prefix)/libexec
53 datarootdir := $(prefix)/share
54 docdir := $(datarootdir)/doc/julia
55 -@@ -413,7 +413,7 @@ ifneq ($(OS), WINNT)
56 +@@ -410,7 +410,7 @@ ifneq ($(OS), WINNT)
57 JCXXFLAGS += -pedantic
58 endif
59 DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector-all
60 @@ -20,7 +20,7 @@ index 8e0df61..5747a1c 100644
61 endif
62
63 ifeq ($(USECLANG),1)
64 -@@ -424,7 +424,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
65 +@@ -421,7 +421,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
66 JCPPFLAGS := -fasynchronous-unwind-tables
67 JCXXFLAGS := -pipe $(fPIC) -fno-rtti -pedantic
68 DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
69 @@ -29,7 +29,7 @@ index 8e0df61..5747a1c 100644
70 ifeq ($(OS), Darwin)
71 ifeq ($(USE_LIBCPP), 1)
72 MACOSX_VERSION_MIN := 10.8
73 -@@ -453,7 +453,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
74 +@@ -450,7 +450,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
75 JCPPFLAGS :=
76 JCXXFLAGS := -pipe $(fPIC) -fno-rtti
77 DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
78 @@ -39,7 +39,7 @@ index 8e0df61..5747a1c 100644
79
80 ifeq ($(USECCACHE), 1)
81 diff --git a/doc/Makefile b/doc/Makefile
82 -index 89b7988..c3125fd 100644
83 +index 89b79880d..c3125fde1 100644
84 --- a/doc/Makefile
85 +++ b/doc/Makefile
86 @@ -29,7 +29,7 @@ deps: UnicodeData.txt
87 @@ -52,10 +52,10 @@ index 89b7988..c3125fd 100644
88 cleanall: clean
89
90 diff --git a/src/Makefile b/src/Makefile
91 -index 20da34d..84eae21 100644
92 +index 257152d24..240a4a350 100644
93 --- a/src/Makefile
94 +++ b/src/Makefile
95 -@@ -88,16 +88,7 @@ UV_HEADERS += uv/*.h
96 +@@ -85,16 +85,7 @@ UV_HEADERS += uv/*.h
97 endif
98 PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLIC_HEADERS)) $(UV_HEADERS))
99
100 @@ -73,3 +73,14 @@ index 20da34d..84eae21 100644
101
102 COMMON_LIBS := -L$(build_shlibdir) -L$(build_libdir) $(LIBUV) $(LIBUTF8PROC) $(NO_WHOLE_ARCHIVE) $(LLVMLINK) $(OSLIBS)
103 DEBUG_LIBS := $(WHOLE_ARCHIVE) $(BUILDDIR)/flisp/libflisp-debug.a $(WHOLE_ARCHIVE) $(BUILDDIR)/support/libsupport-debug.a $(COMMON_LIBS)
104 +
105 +--- a/base/Makefile 2018-08-10 23:56:13.825429621 -0400
106 ++++ b/base/Makefile 2018-08-10 23:43:29.461769645 -0400
107 +@@ -207,7 +207,6 @@
108 + ln -sf "$$REALPATH" "$@"
109 + ifneq ($(USE_SYSTEM_LLVM),0)
110 + ifneq ($(USE_LLVM_SHLIB),0)
111 +-SYMLINK_SYSTEM_LIBRARIES += symlink_libLLVM
112 + endif
113 + endif
114 +
115
116 diff --git a/dev-lang/julia/files/julia-1.0.0-fix_build_system.patch b/dev-lang/julia/files/julia-1.0.0-fix_build_system.patch
117 index 1ed19d6e06e..028a2f7e08c 100644
118 --- a/dev-lang/julia/files/julia-1.0.0-fix_build_system.patch
119 +++ b/dev-lang/julia/files/julia-1.0.0-fix_build_system.patch
120 @@ -1,8 +1,8 @@
121 diff --git a/Make.inc b/Make.inc
122 -index 8e0df61..5747a1c 100644
123 +index 8cb2c1014..d3be9de8e 100644
124 --- a/Make.inc
125 +++ b/Make.inc
126 -@@ -181,7 +181,7 @@ USE_GPL_LIBS ?= 1
127 +@@ -178,7 +178,7 @@ USE_GPL_LIBS ?= 1
128 # Directories where said libraries get installed to
129 prefix ?= $(BUILDROOT)/julia-$(JULIA_COMMIT)
130 bindir := $(prefix)/bin
131 @@ -11,7 +11,7 @@ index 8e0df61..5747a1c 100644
132 libexecdir := $(prefix)/libexec
133 datarootdir := $(prefix)/share
134 docdir := $(datarootdir)/doc/julia
135 -@@ -413,7 +413,7 @@ ifneq ($(OS), WINNT)
136 +@@ -410,7 +410,7 @@ ifneq ($(OS), WINNT)
137 JCXXFLAGS += -pedantic
138 endif
139 DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector-all
140 @@ -20,7 +20,7 @@ index 8e0df61..5747a1c 100644
141 endif
142
143 ifeq ($(USECLANG),1)
144 -@@ -424,7 +424,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
145 +@@ -421,7 +421,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
146 JCPPFLAGS := -fasynchronous-unwind-tables
147 JCXXFLAGS := -pipe $(fPIC) -fno-rtti -pedantic
148 DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
149 @@ -29,7 +29,7 @@ index 8e0df61..5747a1c 100644
150 ifeq ($(OS), Darwin)
151 ifeq ($(USE_LIBCPP), 1)
152 MACOSX_VERSION_MIN := 10.8
153 -@@ -453,7 +453,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
154 +@@ -450,7 +450,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
155 JCPPFLAGS :=
156 JCXXFLAGS := -pipe $(fPIC) -fno-rtti
157 DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
158 @@ -39,7 +39,7 @@ index 8e0df61..5747a1c 100644
159
160 ifeq ($(USECCACHE), 1)
161 diff --git a/doc/Makefile b/doc/Makefile
162 -index 89b7988..c3125fd 100644
163 +index 89b79880d..c3125fde1 100644
164 --- a/doc/Makefile
165 +++ b/doc/Makefile
166 @@ -29,7 +29,7 @@ deps: UnicodeData.txt
167 @@ -52,10 +52,10 @@ index 89b7988..c3125fd 100644
168 cleanall: clean
169
170 diff --git a/src/Makefile b/src/Makefile
171 -index 20da34d..84eae21 100644
172 +index 257152d24..240a4a350 100644
173 --- a/src/Makefile
174 +++ b/src/Makefile
175 -@@ -88,16 +88,7 @@ UV_HEADERS += uv/*.h
176 +@@ -85,16 +85,7 @@ UV_HEADERS += uv/*.h
177 endif
178 PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLIC_HEADERS)) $(UV_HEADERS))
179
180 @@ -73,3 +73,14 @@ index 20da34d..84eae21 100644
181
182 COMMON_LIBS := -L$(build_shlibdir) -L$(build_libdir) $(LIBUV) $(LIBUTF8PROC) $(NO_WHOLE_ARCHIVE) $(LLVMLINK) $(OSLIBS)
183 DEBUG_LIBS := $(WHOLE_ARCHIVE) $(BUILDDIR)/flisp/libflisp-debug.a $(WHOLE_ARCHIVE) $(BUILDDIR)/support/libsupport-debug.a $(COMMON_LIBS)
184 +
185 +--- a/base/Makefile 2018-08-10 23:56:13.825429621 -0400
186 ++++ b/base/Makefile 2018-08-10 23:43:29.461769645 -0400
187 +@@ -207,7 +207,6 @@
188 + ln -sf "$$REALPATH" "$@"
189 + ifneq ($(USE_SYSTEM_LLVM),0)
190 + ifneq ($(USE_LLVM_SHLIB),0)
191 +-SYMLINK_SYSTEM_LIBRARIES += symlink_libLLVM
192 + endif
193 + endif
194 +
195
196 diff --git a/dev-lang/julia/julia-1.0.0.ebuild b/dev-lang/julia/julia-1.0.0.ebuild
197 index 7d03d2d0b87..f7b451ce750 100644
198 --- a/dev-lang/julia/julia-1.0.0.ebuild
199 +++ b/dev-lang/julia/julia-1.0.0.ebuild
200 @@ -7,24 +7,33 @@ RESTRICT="test"
201
202 inherit llvm pax-utils toolchain-funcs
203
204 +MY_LIBUV_V="ed3700c849289ed01fe04273a7bf865340b2bd7e"
205 +MY_UTF8PROC_V="97ef668b312b96382714dbb8eaac4affce0816e6"
206 +MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e"
207 +MY_DSFMT_V="2.2.3"
208 +
209 DESCRIPTION="High-performance programming language for technical computing"
210 HOMEPAGE="https://julialang.org/"
211 SRC_URI="
212 https://github.com/JuliaLang/${PN}/releases/download/v${PV}/${P}.tar.gz
213 - https://dev.gentoo.org/~tamiko/distfiles/${P}-bundled.tar.gz
214 + https://api.github.com/repos/JuliaLang/libuv/tarball/${MY_LIBUV_V} -> ${PN}-libuv-${MY_LIBUV_V}.tar.gz
215 + https://api.github.com/repos/JuliaLang/utf8proc/tarball/${MY_UTF8PROC_V} -> ${PN}-utf8proc-${MY_UTF8PROC_V}.tar.gz
216 + https://api.github.com/repos/vtjnash/libwhich/tarball/${MY_LIBWHICH_V} -> ${PN}-libwhich-${MY_LIBWHICH_V}.tar.gz
217 + http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${MY_DSFMT_V}.tar.gz -> ${PN}-dsfmt-${MY_DSFMT_V}.tar.gz
218 "
219
220 -S="${WORKDIR}/julia"
221 +S="${WORKDIR}/${PN}"
222
223 LICENSE="MIT"
224 SLOT="0"
225 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
226 IUSE=""
227
228 +# julia 0.7* needs a patched llvm-6
229 RDEPEND="
230 - >=sys-devel/llvm-4.0.0:=
231 - >=sys-devel/clang-4.0.0:="
232 -LLVM_MAX_SLOT=5
233 + =sys-devel/llvm-6*:=
234 + =sys-devel/clang-6*:="
235 +LLVM_MAX_SLOT=6
236
237 RDEPEND+="
238 dev-libs/double-conversion:0=
239 @@ -59,12 +68,18 @@ PATCHES=(
240 "${FILESDIR}"/${PN}-1.0.0-fix_build_system.patch
241 )
242
243 -src_prepare() {
244 - mv "${WORKDIR}"/bundled/UnicodeData.txt doc || die
245 - mkdir deps/srccache || die
246 - mv "${WORKDIR}"/bundled/* deps/srccache || die
247 - rmdir "${WORKDIR}"/bundled || die
248 +src_unpack() {
249 + tounpack=(${A})
250 + # the main source tree, followed by deps
251 + unpack "${A/%\ */}"
252 +
253 + mkdir -p "${S}/deps/srccache/"
254 + for i in "${tounpack[@]:1}"; do
255 + cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
256 + done
257 +}
258
259 +src_prepare() {
260 default
261
262 # Sledgehammer:
263 @@ -115,28 +130,27 @@ src_configure() {
264
265 # USE_SYSTEM_LIBM=0 implies using external openlibm
266 cat <<-EOF > Make.user
267 - USE_SYSTEM_DSFMT=0
268 - USE_SYSTEM_LIBUV=0
269 - USE_SYSTEM_PCRE=1
270 - USE_SYSTEM_RMATH=0
271 - USE_SYSTEM_UTF8PROC=0
272 - USE_LLVM_SHLIB=0
273 - USE_SYSTEM_ARPACK=1
274 - USE_SYSTEM_BLAS=1
275 - USE_SYSTEM_FFTW=1
276 - USE_SYSTEM_GMP=1
277 - USE_SYSTEM_GRISU=1
278 - USE_SYSTEM_LAPACK=1
279 - USE_SYSTEM_LIBGIT2=1
280 - USE_SYSTEM_LIBM=0
281 - USE_SYSTEM_LIBUNWIND=1
282 - USE_SYSTEM_LLVM=1
283 - USE_SYSTEM_MPFR=1
284 - USE_SYSTEM_OPENLIBM=1
285 - USE_SYSTEM_OPENSPECFUN=1
286 - USE_SYSTEM_PATCHELF=1
287 - USE_SYSTEM_READLINE=1
288 - USE_SYSTEM_SUITESPARSE=1
289 + USE_SYSTEM_ARPACK:=1
290 + USE_SYSTEM_BLAS:=1
291 + USE_SYSTEM_DSFMT:=0
292 + USE_SYSTEM_GMP:=1
293 + USE_SYSTEM_GRISU:=1
294 + USE_SYSTEM_LAPACK:=1
295 + USE_SYSTEM_LIBGIT2:=1
296 + USE_SYSTEM_LIBM:=0
297 + USE_SYSTEM_LIBUNWIND:=1
298 + USE_SYSTEM_LIBUV:=0
299 + USE_SYSTEM_LLVM:=1
300 + USE_LLVM_SHLIB:=1
301 + USE_SYSTEM_MPFR:=1
302 + USE_SYSTEM_OPENLIBM:=1
303 + USE_SYSTEM_OPENSPECFUN:=1
304 + USE_SYSTEM_PATCHELF:=1
305 + USE_SYSTEM_PCRE:=1
306 + USE_SYSTEM_READLINE:=1
307 + USE_SYSTEM_RMATH:=0
308 + USE_SYSTEM_SUITESPARSE:=1
309 + USE_SYSTEM_UTF8PROC:=0
310 USE_SYSTEM_ZLIB=1
311 VERBOSE=1
312 libdir="${EROOT}/usr/$(get_libdir)"
313 @@ -150,20 +164,7 @@ src_compile() {
314 addpredict /proc/self/mem
315
316 emake cleanall
317 -
318 - # Create symlinks...
319 - local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
320 - libblas="${libblas%% *}"
321 - libblas="lib${libblas#-l}"
322 - local liblapack="$($(tc-getPKG_CONFIG) --libs-only-l lapack)"
323 - liblapack="${liblapack%% *}"
324 - liblapack="lib${liblapack#-l}"
325 - mkdir -p "${S}"/usr/lib/julia || die "mkdir failed"
326 - for i in ${libblas}.so ${liblapack}.so libumfpack.so libspqr.so; do
327 - ln -s "${EROOT}/usr/$(get_libdir)/${i}" "${S}"/usr/lib/julia/ || die "ln failed"
328 - done
329 -
330 - emake VERBOSE=1 julia-release \
331 + emake julia-release \
332 prefix="${EPREFIX}/usr" DESTDIR="${D}" \
333 CC="$(tc-getCC)" CXX="$(tc-getCXX)"
334 pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
335 @@ -195,7 +196,6 @@ src_install() {
336
337 mv "${ED}"/usr/etc/julia "${ED}"/etc || die
338 rmdir "${ED}"/usr/etc || die
339 - mv "${ED}"/usr/share/doc/julia/{examples,html} \
340 - "${ED}"/usr/share/doc/${PF} || die
341 + mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/${PF} || die
342 rmdir "${ED}"/usr/share/doc/julia || die
343 }