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, 18 Jul 2017 19:39:45
Message-Id: 1500406737.f3506fdb14a41519aef6905d992d2f1dde53ef10.tamiko@gentoo
1 commit: f3506fdb14a41519aef6905d992d2f1dde53ef10
2 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 18 19:13:30 2017 +0000
4 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 18 19:38:57 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3506fdb
7
8 dev-lang/julia: add new ebuild for 0.6.0
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.2
11
12 dev-lang/julia/Manifest | 2 +
13 ...em.patch => julia-0.6.0-fix_build_system.patch} | 39 +++--
14 .../julia/files/julia-9999-fix_build_system.patch | 39 +++--
15 dev-lang/julia/julia-0.6.0.ebuild | 176 +++++++++++++++++++++
16 4 files changed, 234 insertions(+), 22 deletions(-)
17
18 diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
19 index c91190d4268..344995da4b7 100644
20 --- a/dev-lang/julia/Manifest
21 +++ b/dev-lang/julia/Manifest
22 @@ -1,2 +1,4 @@
23 DIST julia-0.5.0-bundled.tar.gz 3461547 SHA256 3f4887fc2c0112666eb28b99f86bd8f7bd50615325e03135c546127885d46fbf SHA512 f8df589edf7d6b0e1e6553583c81d26fd256a79cacd79fbdd0ea1a9eea46b2466e3cbf055b5b7aa2d5c08318a5c35b9c09a30ac46a48689cc5c7245954b615c8 WHIRLPOOL b0137b2ed55aef7dc2c1a8693043ce63305bd2bbb5c2f959b2752fdb68189a506b027b467bfc0bb443fa4202f3735dd9410a257adec08302dfcaa0c9e4bfed98
24 DIST julia-0.5.0.tar.gz 6326490 SHA256 bb62a14806e58f079ecd4941d4a18d1f1c1d89ab33c826d3a58a2244e364112e SHA512 6d76c5050da5050cd541c8407c35c8ecd60ad2ba61c4defcc5c084aaeb09e82ffed09be79a3453000bdf88efe56039948335bab21c8389389ffb8b29806568de WHIRLPOOL 7f0066cc7fa912fe7ce5b6bf43449d828b0b9dcf2ab57df6c13a0df17ee53351c6deb30e7b998dc00ff53c548074d79ed6288bc79507afebc4fd827b3e3c032f
25 +DIST julia-0.6.0-bundled.tar.gz 2097663 SHA256 2c5505baa76649c35b239aeed20a238427cad76ed4c93bc538f672a1f1ea18dd SHA512 50581da3628930b2d1b89d226f3551fa7b18ca23c322b7e93d1227cc0c3428f255a6087f9859ff2c592014407d53238e01a3847a727a87287fb8c7f679b022d1 WHIRLPOOL 6c07396cebd4799c66e1dc403185b330d5dd9816786d84de5a995782571ce31ceb249d46811540a1d7f87377a9db25b45572f148af4107feaef79b2aec13e89f
26 +DIST julia-0.6.0.tar.gz 5565427 SHA256 1c62bfce8075acf2b5b02355520a61210690324eceb021030681459d18a3a665 SHA512 da21b35eb2c682c0fb8720974a76759c51fe993f10e6af5ca4864fc7f0bb6c90d880b706eb798476c7228bae2db19ff0825add6a2abde2961f16a93a3050cb69 WHIRLPOOL 7bc1bb82d4ee112d258473d1200b99dfd1a48ae59d9a9b700e60484c6007e45aed3a6bc42b5ecf7d3eae2c61cab166a1086c8c16f5039abd073571cb83fde4a9
27
28 diff --git a/dev-lang/julia/files/julia-9999-fix_build_system.patch b/dev-lang/julia/files/julia-0.6.0-fix_build_system.patch
29 similarity index 70%
30 copy from dev-lang/julia/files/julia-9999-fix_build_system.patch
31 copy to dev-lang/julia/files/julia-0.6.0-fix_build_system.patch
32 index 4ed2822c141..6f804161775 100644
33 --- a/dev-lang/julia/files/julia-9999-fix_build_system.patch
34 +++ b/dev-lang/julia/files/julia-0.6.0-fix_build_system.patch
35 @@ -1,8 +1,8 @@
36 diff --git a/Make.inc b/Make.inc
37 -index 651c9df..ff01872 100644
38 +index e30c150..e6fdbb2 100644
39 --- a/Make.inc
40 +++ b/Make.inc
41 -@@ -389,7 +389,7 @@ ifneq ($(OS), WINNT)
42 +@@ -399,7 +399,7 @@ ifneq ($(OS), WINNT)
43 JCXXFLAGS += -pedantic
44 endif
45 DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector-all
46 @@ -11,7 +11,7 @@ index 651c9df..ff01872 100644
47 endif
48
49 ifeq ($(USECLANG),1)
50 -@@ -400,7 +400,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
51 +@@ -410,7 +410,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
52 JCPPFLAGS := -fasynchronous-unwind-tables
53 JCXXFLAGS := -pipe $(fPIC) -fno-rtti -pedantic
54 DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
55 @@ -19,8 +19,8 @@ index 651c9df..ff01872 100644
56 +SHIPFLAGS := GENTOOCFLAGS
57 ifeq ($(OS), Darwin)
58 ifeq ($(USE_LIBCPP), 1)
59 - CC += -stdlib=libc++ -mmacosx-version-min=10.7
60 -@@ -427,7 +427,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
61 + MACOSX_VERSION_MIN := 10.8
62 +@@ -439,7 +439,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
63 JCPPFLAGS :=
64 JCXXFLAGS := -pipe $(fPIC) -fno-rtti
65 DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
66 @@ -29,24 +29,41 @@ index 651c9df..ff01872 100644
67 endif
68
69 ifeq ($(USECCACHE), 1)
70 +diff --git a/deps/tools/jldownload b/deps/tools/jldownload
71 +index ab4fd69..e2c2408 100755
72 +--- a/deps/tools/jldownload
73 ++++ b/deps/tools/jldownload
74 +@@ -5,9 +5,9 @@
75 +
76 + CACHE_HOST=https://cache.julialang.org
77 +
78 +-WGET=$(which wget 2>/dev/null)
79 +-CURL=$(which curl 2>/dev/null)
80 +-FETCH=$(which fetch 2>/dev/null)
81 ++WGET=/bin/true
82 ++CURL=/bin/true
83 ++FETCH=/bin/true
84 +
85 + TIMEOUT=15 # seconds
86 + WGET_OPTS="--no-check-certificate --tries=1 --timeout=$TIMEOUT"
87 diff --git a/doc/Makefile b/doc/Makefile
88 -index 0749d73..f4d49ec 100644
89 +index 743804d..e06dde0 100644
90 --- a/doc/Makefile
91 +++ b/doc/Makefile
92 -@@ -62,7 +62,7 @@ help:
93 - @echo " doctest to run all doctests embedded in the documentation (if enabled)"
94 +@@ -25,7 +25,7 @@ deps: UnicodeData.txt
95 + $(JLCHECKSUM) UnicodeData.txt
96
97 clean:
98 -- -rm -rf _build/*
99 +- -rm -rf _build/* deps/* docbuild.log UnicodeData.txt
100 + @echo "Do not clean doc/_build/html. Just use it..."
101
102 cleanall: clean
103
104 diff --git a/src/Makefile b/src/Makefile
105 -index d7ec864..61d2470 100644
106 +index f71f53d..7cdd23f 100644
107 --- a/src/Makefile
108 +++ b/src/Makefile
109 -@@ -66,20 +66,8 @@ HEADERS := $(addprefix $(SRCDIR)/,julia.h julia_threads.h julia_internal.h optio
110 +@@ -85,20 +85,8 @@ PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLI
111
112 # In LLVM < 3.4, --ldflags includes both options and libraries, so use it both before and after --libs
113 # In LLVM >= 3.4, --ldflags has only options, and --system-libs has the libraries.
114
115 diff --git a/dev-lang/julia/files/julia-9999-fix_build_system.patch b/dev-lang/julia/files/julia-9999-fix_build_system.patch
116 index 4ed2822c141..6f804161775 100644
117 --- a/dev-lang/julia/files/julia-9999-fix_build_system.patch
118 +++ b/dev-lang/julia/files/julia-9999-fix_build_system.patch
119 @@ -1,8 +1,8 @@
120 diff --git a/Make.inc b/Make.inc
121 -index 651c9df..ff01872 100644
122 +index e30c150..e6fdbb2 100644
123 --- a/Make.inc
124 +++ b/Make.inc
125 -@@ -389,7 +389,7 @@ ifneq ($(OS), WINNT)
126 +@@ -399,7 +399,7 @@ ifneq ($(OS), WINNT)
127 JCXXFLAGS += -pedantic
128 endif
129 DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector-all
130 @@ -11,7 +11,7 @@ index 651c9df..ff01872 100644
131 endif
132
133 ifeq ($(USECLANG),1)
134 -@@ -400,7 +400,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
135 +@@ -410,7 +410,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
136 JCPPFLAGS := -fasynchronous-unwind-tables
137 JCXXFLAGS := -pipe $(fPIC) -fno-rtti -pedantic
138 DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
139 @@ -19,8 +19,8 @@ index 651c9df..ff01872 100644
140 +SHIPFLAGS := GENTOOCFLAGS
141 ifeq ($(OS), Darwin)
142 ifeq ($(USE_LIBCPP), 1)
143 - CC += -stdlib=libc++ -mmacosx-version-min=10.7
144 -@@ -427,7 +427,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
145 + MACOSX_VERSION_MIN := 10.8
146 +@@ -439,7 +439,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
147 JCPPFLAGS :=
148 JCXXFLAGS := -pipe $(fPIC) -fno-rtti
149 DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
150 @@ -29,24 +29,41 @@ index 651c9df..ff01872 100644
151 endif
152
153 ifeq ($(USECCACHE), 1)
154 +diff --git a/deps/tools/jldownload b/deps/tools/jldownload
155 +index ab4fd69..e2c2408 100755
156 +--- a/deps/tools/jldownload
157 ++++ b/deps/tools/jldownload
158 +@@ -5,9 +5,9 @@
159 +
160 + CACHE_HOST=https://cache.julialang.org
161 +
162 +-WGET=$(which wget 2>/dev/null)
163 +-CURL=$(which curl 2>/dev/null)
164 +-FETCH=$(which fetch 2>/dev/null)
165 ++WGET=/bin/true
166 ++CURL=/bin/true
167 ++FETCH=/bin/true
168 +
169 + TIMEOUT=15 # seconds
170 + WGET_OPTS="--no-check-certificate --tries=1 --timeout=$TIMEOUT"
171 diff --git a/doc/Makefile b/doc/Makefile
172 -index 0749d73..f4d49ec 100644
173 +index 743804d..e06dde0 100644
174 --- a/doc/Makefile
175 +++ b/doc/Makefile
176 -@@ -62,7 +62,7 @@ help:
177 - @echo " doctest to run all doctests embedded in the documentation (if enabled)"
178 +@@ -25,7 +25,7 @@ deps: UnicodeData.txt
179 + $(JLCHECKSUM) UnicodeData.txt
180
181 clean:
182 -- -rm -rf _build/*
183 +- -rm -rf _build/* deps/* docbuild.log UnicodeData.txt
184 + @echo "Do not clean doc/_build/html. Just use it..."
185
186 cleanall: clean
187
188 diff --git a/src/Makefile b/src/Makefile
189 -index d7ec864..61d2470 100644
190 +index f71f53d..7cdd23f 100644
191 --- a/src/Makefile
192 +++ b/src/Makefile
193 -@@ -66,20 +66,8 @@ HEADERS := $(addprefix $(SRCDIR)/,julia.h julia_threads.h julia_internal.h optio
194 +@@ -85,20 +85,8 @@ PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLI
195
196 # In LLVM < 3.4, --ldflags includes both options and libraries, so use it both before and after --libs
197 # In LLVM >= 3.4, --ldflags has only options, and --system-libs has the libraries.
198
199 diff --git a/dev-lang/julia/julia-0.6.0.ebuild b/dev-lang/julia/julia-0.6.0.ebuild
200 new file mode 100644
201 index 00000000000..9fc210dd85b
202 --- /dev/null
203 +++ b/dev-lang/julia/julia-0.6.0.ebuild
204 @@ -0,0 +1,176 @@
205 +# Copyright 1999-2017 Gentoo Foundation
206 +# Distributed under the terms of the GNU General Public License v2
207 +
208 +EAPI=6
209 +
210 +RESTRICT="test"
211 +
212 +inherit eutils multilib pax-utils toolchain-funcs
213 +
214 +DESCRIPTION="High-performance programming language for technical computing"
215 +HOMEPAGE="http://julialang.org/"
216 +SRC_URI="
217 + https://github.com/JuliaLang/${PN}/releases/download/v${PV}/${P}.tar.gz
218 + https://dev.gentoo.org/~tamiko/distfiles/${P}-bundled.tar.gz
219 +"
220 +
221 +LICENSE="MIT"
222 +SLOT="0"
223 +#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
224 +KEYWORDS=""
225 +IUSE=""
226 +
227 +RDEPEND="
228 + dev-lang/R:0=
229 + dev-libs/double-conversion:0=
230 + dev-libs/gmp:0=
231 + <dev-libs/libgit2-0.25:0=
232 + dev-libs/mpfr:0=
233 + dev-libs/openspecfun
234 + sci-libs/arpack:0=
235 + sci-libs/camd:0=
236 + sci-libs/cholmod:0=
237 + sci-libs/fftw:3.0=[threads]
238 + sci-libs/openlibm:0=
239 + sci-libs/spqr:0=
240 + >=dev-libs/libpcre2-10.23:0=[jit]
241 + sci-libs/umfpack:0=
242 + sci-mathematics/glpk:0=
243 + >=sys-devel/llvm-3.9:0=
244 + >=sys-libs/libunwind-1.1:7=
245 + sys-libs/readline:0=
246 + sys-libs/zlib:0=
247 + >=virtual/blas-3.6
248 + virtual/lapack"
249 +
250 +DEPEND="${RDEPEND}
251 + dev-util/patchelf
252 + virtual/pkgconfig"
253 +
254 +PATCHES=(
255 + "${FILESDIR}"/${P}-fix_build_system.patch
256 +)
257 +
258 +src_prepare() {
259 + mv "${WORKDIR}"/bundled/UnicodeData.txt doc || die
260 + mkdir deps/srccache || die
261 + mv "${WORKDIR}"/bundled/* deps/srccache || die
262 + rmdir "${WORKDIR}"/bundled || die
263 +
264 + default
265 +
266 + # Sledgehammer:
267 + # - prevent fetching of bundled stuff in compile and install phase
268 + # - respect CFLAGS
269 + # - respect EPREFIX and Gentoo specific paths
270 + # - fix BLAS and LAPACK link interface
271 +
272 + sed -i \
273 + -e 's|$(JLDOWNLOAD)|${EPREFIX}/bin/true|' \
274 + -e 's|git submodule|${EPREFIX}/bin/true|g' \
275 + -e "s|GENTOOCFLAGS|${CFLAGS}|g" \
276 + -e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
277 + deps/Makefile || die
278 +
279 + local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
280 + libblas="${libblas%% *}"
281 + libblas="lib${libblas#-l}"
282 + local liblapack="$($(tc-getPKG_CONFIG) --libs-only-l lapack)"
283 + liblapack="${liblapack%% *}"
284 + liblapack="lib${liblapack#-l}"
285 +
286 + sed -i \
287 + -e "s|\(JULIA_EXECUTABLE = \)\(\$(JULIAHOME)/julia\)|\1 LD_LIBRARY_PATH=\$(BUILD)/$(get_libdir) \2|" \
288 + -e "s|GENTOOCFLAGS|${CFLAGS}|g" \
289 + -e "s|LIBDIR = lib|LIBDIR = $(get_libdir)|" \
290 + -e "s|/usr/lib|${EPREFIX}/usr/$(get_libdir)|" \
291 + -e "s|/usr/include|${EPREFIX}/usr/include|" \
292 + -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|" \
293 + -e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \
294 + -e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \
295 + -e "s|= libblas|= ${libblas}|" \
296 + -e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \
297 + -e "s|= liblapack|= ${liblapack}|" \
298 + Make.inc || die
299 +
300 + sed -i \
301 + -e "s|,lib)|,$(get_libdir))|g" \
302 + -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
303 + Makefile || die
304 +
305 + sed -i \
306 + -e "s|ar -rcs|$(tc-getAR) -rcs|g" \
307 + src/Makefile || die
308 +}
309 +
310 +src_configure() {
311 + # julia does not play well with the system versions of dsfmt, libuv,
312 + # and utf8proc
313 +
314 + # USE_SYSTEM_LIBM=0 implies using external openlibm
315 + cat <<-EOF > Make.user
316 + USE_SYSTEM_DSFMT=0
317 + USE_SYSTEM_LIBUV=0
318 + USE_SYSTEM_PCRE=1
319 + USE_SYSTEM_RMATH=0
320 + USE_SYSTEM_UTF8PROC=0
321 + USE_LLVM_SHLIB=1
322 + USE_SYSTEM_ARPACK=1
323 + USE_SYSTEM_BLAS=1
324 + USE_SYSTEM_FFTW=1
325 + USE_SYSTEM_GMP=1
326 + USE_SYSTEM_GRISU=1
327 + USE_SYSTEM_LAPACK=1
328 + USE_SYSTEM_LIBGIT2=1
329 + USE_SYSTEM_LIBM=0
330 + USE_SYSTEM_LIBUNWIND=1
331 + USE_SYSTEM_LLVM=1
332 + USE_SYSTEM_MPFR=1
333 + USE_SYSTEM_OPENLIBM=1
334 + USE_SYSTEM_OPENSPECFUN=1
335 + USE_SYSTEM_PATCHELF=1
336 + USE_SYSTEM_READLINE=1
337 + USE_SYSTEM_SUITESPARSE=1
338 + USE_SYSTEM_ZLIB=1
339 + VERBOSE=1
340 + libdir="${EROOT}/usr/$(get_libdir)"
341 + EOF
342 +
343 +}
344 +
345 +src_compile() {
346 +
347 + # Julia accesses /proc/self/mem on Linux
348 + addpredict /proc/self/mem
349 +
350 + emake cleanall
351 + emake VERBOSE=1 julia-release \
352 + prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
353 + pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
354 + emake
355 +}
356 +
357 +src_test() {
358 + emake test
359 +}
360 +
361 +src_install() {
362 + emake install \
363 + prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
364 + cat > 99julia <<-EOF
365 + LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
366 + EOF
367 + doenvd 99julia
368 +
369 + dodoc README.md
370 +
371 + mv "${ED}"/usr/etc/julia "${ED}"/etc || die
372 + rmdir "${ED}"/usr/etc || die
373 + mv "${ED}"/usr/share/doc/julia/{examples,html} \
374 + "${ED}"/usr/share/doc/${PF} || die
375 + rmdir "${ED}"/usr/share/doc/julia || die
376 + if [[ $(get_libdir) != lib ]]; then
377 + mkdir -p "${ED}"/usr/$(get_libdir) || die
378 + mv "${ED}"/usr/lib/julia "${ED}"/usr/$(get_libdir)/julia || die
379 + fi
380 +}