From f70601e0934acd62f6c5d06c5ede4cc607179514 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 7 Jul 2018 11:42:03 +0100 Subject: gentoo resync : 07.07.2018 --- dev-lang/julia/Manifest | 14 +- .../julia/files/julia-0.6.0-fix_build_system.patch | 87 --------- .../julia/files/julia-0.6.3-fix_build_system.patch | 96 ++++++++++ .../julia/files/julia-9999-fix_build_system.patch | 29 ++- dev-lang/julia/julia-0.6.2.ebuild | 194 --------------------- dev-lang/julia/julia-0.6.3-r1.ebuild | 186 ++++++++++++++++++++ dev-lang/julia/julia-9999.ebuild | 14 +- dev-lang/julia/metadata.xml | 8 +- 8 files changed, 315 insertions(+), 313 deletions(-) delete mode 100644 dev-lang/julia/files/julia-0.6.0-fix_build_system.patch create mode 100644 dev-lang/julia/files/julia-0.6.3-fix_build_system.patch delete mode 100644 dev-lang/julia/julia-0.6.2.ebuild create mode 100644 dev-lang/julia/julia-0.6.3-r1.ebuild (limited to 'dev-lang/julia') diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest index 51990780f68e..60f324c1e94e 100644 --- a/dev-lang/julia/Manifest +++ b/dev-lang/julia/Manifest @@ -1,7 +1,7 @@ -AUX julia-0.6.0-fix_build_system.patch 3221 BLAKE2B a12ff55fd99444dfbdee5e1e0ead98ebc2c7d1bbeb95c7afc5c776248ca322dd596833c68f68d7ea4812def6cce322dc996f45187cb4b730e2ae44e080dec35f SHA512 5cca475d1fb4864bd26326eb3a6da0338fc473de26057848ae3c15f49c0a3b338c7d4d26ce906307d7f6fac2ca08c8df8551fc3a33b7d86dfe859dae52e50e67 -AUX julia-9999-fix_build_system.patch 2562 BLAKE2B 6300c91745656c47beff2f201376cb5ade9bc504fd416fe0c50867b4e3dffb5edd9295aebd1b8d43b1c1ecbeaa7382864c61604191f3df2b7162556ffd2499c4 SHA512 cdf084881f70890f523690eaae3e059ed09688156851dbf0c19878e8d6b76aee8a7144a9d604087c61c5db30634db530dfeba943ad170003439c8696715f677d -DIST julia-0.6.2-bundled.tar.gz 3508868 BLAKE2B b5b3f52d8036e5603b62606cd096f22f8a975f9cab2f9baad902c0208a81868359005e82a17e513a7705ec717750702cdc12ab476ffac3c1c38158f06d80ae99 SHA512 3a9a6cc43aab2eae6c57812287958e3a1ac1718d6fdf08e5ce7c8e8e8a62231fb4d7b6f064e2d6941ac750d8924f5cb37ae3ac4e2d18f366a82c94bdc9e6abe4 -DIST julia-0.6.2.tar.gz 5592907 BLAKE2B d6d25f43cd650f6a079c4ba6fe533e6bdbf6a1123255d7651460e297ed3d35a832688e19efddf41c780fbda2eb861bc8ed5f7c59ea7efb5fdf490eb2e7a47f5d SHA512 679050463ed5825d34c477bd44cd91cfecc7d1735a2f52cc70b509afd9883cb60902861643266ecac5ba6cbb03f8fcdd12fc2e87dc41b9ed0eef813fa40610f1 -EBUILD julia-0.6.2.ebuild 5039 BLAKE2B ccc6ede277e571ca67ca945c8b98da5171dfe0c195ca9d834b04b9c636d32f61912740614fa6d439f8a3e7e5675a13b97c7dc9538db3e473d6bba030522c0afa SHA512 cf91d5f8b249cce1e5ff7e7af8e6bb187785a5ea5c53aa35f0dc4dedd10b0cd31ca88a34cdf432a14e5f3a61beac4c86288fe0168434511082575b389c626506 -EBUILD julia-9999.ebuild 3999 BLAKE2B 2a043ca0fa70101b807f625cc3a77bff45bf3e04467047cc48e84099750c6cf4bb2add100d3da4845c945c5f93fafe8efe18200aed180b4bf84e49180c538276 SHA512 0ba4882a6abd0413e250901eac9476c7e97c9079635151df3957079e120f7c19a9cfba4a44a8e16d63e2e0b0b7faad933260e278b3824b3e694503f508b338f6 -MISC metadata.xml 1177 BLAKE2B ef735dbeb4067f98e71bbd22c16f43eab7c5507fb99815eba4a61370593bdf2d778ff6c18301b73869117e56014c93b61a42d5467539ee2ceac9307595cb0eb2 SHA512 1ed4c6477da40c7a79ee1f9efe1a33eb0ea61ee150a5a50b0c0e0241b0177541d7953d4043d159036f68d116aa41fa9413caa01b36c688fcdfb874e6627f234d +AUX julia-0.6.3-fix_build_system.patch 3543 BLAKE2B cbeefd07f805f5052e4ed505d442c4ca2ef02becd87211706298c3340dda6c2672f91246c5bc8d339a0d931b7a1c8121568a0bbbd382c75c7c463b0226363ae3 SHA512 0a7881db50df8dccd6296327a8029a7335d131e7c3e4233bf284ab50875bb12856ae8b08e381d322c48a5180343199a6c9e4a454118390136723bc254eb2dd1a +AUX julia-9999-fix_build_system.patch 2920 BLAKE2B b9021a4092cb95c86b10ad7ff6e1623528070f81ef86c0b6524b88e93dd625df49aaaad43ede09bbac02e824b6bf589106289ea8cb9f702ef0617710ba8a94a9 SHA512 90b134e0eb2897300d7601f19a6010b9515162a12ab020002d99ae276d0bdd197efd512fd1468770dbc7204161bc90acfb84e9db7ba23b18d81bece98935e64f +DIST julia-0.6.3-bundled.tar.gz 2099258 BLAKE2B dea1f5d37477e0a612e3901d7d568e8c4b350496f9d2b344cd7e2c2043ae30b4dd26b567803a2cb96d1ec4dbe2ba514fb08b925c695589746691887334330dd2 SHA512 d04cd55ba0dde08f253db3a388cf5ebe87cec8ae321a5af4c1c92f2680aa6e6ef2ebfa771ec74f8f1ff96409e2c0645476acf577859e8718eac4a581f097639d +DIST julia-0.6.3.tar.gz 5542642 BLAKE2B cccd1ee2eb4d9f59382a0d1f6466e77c84b0542456c405c05b718bc8a39ff537a09760a523ee572fc9eee6797158aa00010fc4c931a80deac645fb1e45061c87 SHA512 f529bb30a17989234061cf4c3d87aecc6da720eb494efaca7be4ec1ed5eda60d440896fb76a45b6cb30205030256e7de765e8944f873b31d96f7c9ecac542db8 +EBUILD julia-0.6.3-r1.ebuild 4574 BLAKE2B 7433cd8f928505b5b357c3fd6531324c359af09b73114596398f49bc059b4964b725f72424fdcfeed3d43b48a2b560251b7b02e3d9c0ce4ae060011b0f823d60 SHA512 5fae0e3abf964214f957932c0d04a204d8cf1184a2ac4812bfd9d90fa899e5dad36ea0e501da8735daab922b5186da685c88f9188ac089566e36f701de5c3704 +EBUILD julia-9999.ebuild 3557 BLAKE2B 6cc962dcb0b40253bbe3c993f99a063b9587f470d8e6ffa0a6231d8a5806215d026b673abe878d5a169a096676a53902545176103a1a4bb302abbec2988897c2 SHA512 f4a24f9796c2fad173f261613056993fa0c513d6251b89a07853fef7dc97d9f56c781e283c1c66cb3a73e734050f577c0f1b6fd6fb153a78bd2456286aa1ca67 +MISC metadata.xml 1177 BLAKE2B 2b9a30c5fdce2acb40b98b010192144cf7462464d4776105e4b6cdce0782b4c55993a7e335804b301b0ae970b4eb0eeec354be9daa3d012ad28dbf0ba5975333 SHA512 4a33844ce7acdfd0812dd1b5f07b87b4dcf73fdae9eadd372f923a5b5397ded41d045fa3de27b92206ed47376499b7c23c962c29eb72778b2f79ef51342be873 diff --git a/dev-lang/julia/files/julia-0.6.0-fix_build_system.patch b/dev-lang/julia/files/julia-0.6.0-fix_build_system.patch deleted file mode 100644 index 6f8041617751..000000000000 --- a/dev-lang/julia/files/julia-0.6.0-fix_build_system.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff --git a/Make.inc b/Make.inc -index e30c150..e6fdbb2 100644 ---- a/Make.inc -+++ b/Make.inc -@@ -399,7 +399,7 @@ ifneq ($(OS), WINNT) - JCXXFLAGS += -pedantic - endif - DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector-all --SHIPFLAGS := -O3 -ggdb2 -falign-functions -+SHIPFLAGS := GENTOOCFLAGS - endif - - ifeq ($(USECLANG),1) -@@ -410,7 +410,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 - JCPPFLAGS := -fasynchronous-unwind-tables - JCXXFLAGS := -pipe $(fPIC) -fno-rtti -pedantic - DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all --SHIPFLAGS := -O3 -g -+SHIPFLAGS := GENTOOCFLAGS - ifeq ($(OS), Darwin) - ifeq ($(USE_LIBCPP), 1) - MACOSX_VERSION_MIN := 10.8 -@@ -439,7 +439,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 - JCPPFLAGS := - JCXXFLAGS := -pipe $(fPIC) -fno-rtti - DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all --SHIPFLAGS := -O3 -g -falign-functions -+SHIPFLAGS := GENTOOCFLAGS - endif - - ifeq ($(USECCACHE), 1) -diff --git a/deps/tools/jldownload b/deps/tools/jldownload -index ab4fd69..e2c2408 100755 ---- a/deps/tools/jldownload -+++ b/deps/tools/jldownload -@@ -5,9 +5,9 @@ - - CACHE_HOST=https://cache.julialang.org - --WGET=$(which wget 2>/dev/null) --CURL=$(which curl 2>/dev/null) --FETCH=$(which fetch 2>/dev/null) -+WGET=/bin/true -+CURL=/bin/true -+FETCH=/bin/true - - TIMEOUT=15 # seconds - WGET_OPTS="--no-check-certificate --tries=1 --timeout=$TIMEOUT" -diff --git a/doc/Makefile b/doc/Makefile -index 743804d..e06dde0 100644 ---- a/doc/Makefile -+++ b/doc/Makefile -@@ -25,7 +25,7 @@ deps: UnicodeData.txt - $(JLCHECKSUM) UnicodeData.txt - - clean: -- -rm -rf _build/* deps/* docbuild.log UnicodeData.txt -+ @echo "Do not clean doc/_build/html. Just use it..." - - cleanall: clean - -diff --git a/src/Makefile b/src/Makefile -index f71f53d..7cdd23f 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -85,20 +85,8 @@ PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLI - - # In LLVM < 3.4, --ldflags includes both options and libraries, so use it both before and after --libs - # In LLVM >= 3.4, --ldflags has only options, and --system-libs has the libraries. --ifneq ($(USE_LLVM_SHLIB),1) --LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) $(shell $(LLVM_CONFIG_HOST) --libs $(LLVM_LIBS)) $(shell $(LLVM_CONFIG_HOST) --ldflags) $(shell $(LLVM_CONFIG_HOST) --system-libs 2> /dev/null) --else --ifeq ($(LLVM_USE_CMAKE),1) --LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM --else --ifeq ($(OS),WINNT) --LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(LLVM_VER_SHORT) --else --LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(shell $(LLVM_CONFIG_HOST) --version) --endif # OS == WINNT --endif # LLVM_USE_CMAKE == 1 -+LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs) - FLAGS += -DLLVM_SHLIB --endif # USE_LLVM_SHLIB == 1 - - COMMON_LIBS := -L$(build_shlibdir) -L$(build_libdir) $(LIBUV) $(LIBUTF8PROC) $(NO_WHOLE_ARCHIVE) $(LLVMLINK) $(OSLIBS) - DEBUG_LIBS := $(WHOLE_ARCHIVE) $(BUILDDIR)/flisp/libflisp-debug.a $(WHOLE_ARCHIVE) $(BUILDDIR)/support/libsupport-debug.a $(COMMON_LIBS) diff --git a/dev-lang/julia/files/julia-0.6.3-fix_build_system.patch b/dev-lang/julia/files/julia-0.6.3-fix_build_system.patch new file mode 100644 index 000000000000..41e64672adf8 --- /dev/null +++ b/dev-lang/julia/files/julia-0.6.3-fix_build_system.patch @@ -0,0 +1,96 @@ +diff --git a/Make.inc b/Make.inc +index 7f3a37c..3560d93 100644 +--- a/Make.inc ++++ b/Make.inc +@@ -180,7 +180,7 @@ USE_GPL_LIBS ?= 1 + # Directories where said libraries get installed to + prefix ?= $(BUILDROOT)/julia-$(JULIA_COMMIT) + bindir := $(prefix)/bin +-libdir := $(prefix)/lib ++libdir := $(prefix)/GENTOOLIBDIR + libexecdir := $(prefix)/libexec + datarootdir := $(prefix)/share + docdir := $(datarootdir)/doc/julia +@@ -400,7 +400,7 @@ ifneq ($(OS), WINNT) + JCXXFLAGS += -pedantic + endif + DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector-all +-SHIPFLAGS := -O3 -ggdb2 -falign-functions ++SHIPFLAGS := GENTOOCFLAGS + endif + + ifeq ($(USECLANG),1) +@@ -411,7 +411,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 + JCPPFLAGS := -fasynchronous-unwind-tables + JCXXFLAGS := -pipe $(fPIC) -fno-rtti -pedantic + DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all +-SHIPFLAGS := -O3 -g ++SHIPFLAGS := GENTOOCFLAGS + ifeq ($(OS), Darwin) + ifeq ($(USE_LIBCPP), 1) + MACOSX_VERSION_MIN := 10.8 +@@ -440,7 +440,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 + JCPPFLAGS := + JCXXFLAGS := -pipe $(fPIC) -fno-rtti + DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all +-SHIPFLAGS := -O3 -g -falign-functions ++SHIPFLAGS := GENTOOCFLAGS + endif + + ifeq ($(USECCACHE), 1) +diff --git a/deps/tools/jldownload b/deps/tools/jldownload +index ab4fd69..e2c2408 100755 +--- a/deps/tools/jldownload ++++ b/deps/tools/jldownload +@@ -5,9 +5,9 @@ + + CACHE_HOST=https://cache.julialang.org + +-WGET=$(which wget 2>/dev/null) +-CURL=$(which curl 2>/dev/null) +-FETCH=$(which fetch 2>/dev/null) ++WGET=/bin/true ++CURL=/bin/true ++FETCH=/bin/true + + TIMEOUT=15 # seconds + WGET_OPTS="--no-check-certificate --tries=1 --timeout=$TIMEOUT" +diff --git a/doc/Makefile b/doc/Makefile +index 743804d..e06dde0 100644 +--- a/doc/Makefile ++++ b/doc/Makefile +@@ -25,7 +25,7 @@ deps: UnicodeData.txt + $(JLCHECKSUM) UnicodeData.txt + + clean: +- -rm -rf _build/* deps/* docbuild.log UnicodeData.txt ++ @echo "Do not clean doc/_build/html. Just use it..." + + cleanall: clean + +diff --git a/src/Makefile b/src/Makefile +index 9fde74d..e01ab2e 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -85,20 +85,8 @@ PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLI + + # In LLVM < 3.4, --ldflags includes both options and libraries, so use it both before and after --libs + # In LLVM >= 3.4, --ldflags has only options, and --system-libs has the libraries. +-ifneq ($(USE_LLVM_SHLIB),1) +-LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) $(shell $(LLVM_CONFIG_HOST) --libs $(LLVM_LIBS)) $(shell $(LLVM_CONFIG_HOST) --ldflags) $(shell $(LLVM_CONFIG_HOST) --system-libs 2> /dev/null) +-else +-ifeq ($(LLVM_USE_CMAKE),1) +-LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM +-else +-ifeq ($(OS),WINNT) +-LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(LLVM_VER_SHORT) +-else +-LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(shell $(LLVM_CONFIG_HOST) --version) +-endif # OS == WINNT +-endif # LLVM_USE_CMAKE == 1 ++LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs) + FLAGS += -DLLVM_SHLIB +-endif # USE_LLVM_SHLIB == 1 + + COMMON_LIBS := -L$(build_shlibdir) -L$(build_libdir) $(LIBUV) $(LIBUTF8PROC) $(NO_WHOLE_ARCHIVE) $(LLVMLINK) $(OSLIBS) + DEBUG_LIBS := $(WHOLE_ARCHIVE) $(BUILDDIR)/flisp/libflisp-debug.a $(WHOLE_ARCHIVE) $(BUILDDIR)/support/libsupport-debug.a $(COMMON_LIBS) diff --git a/dev-lang/julia/files/julia-9999-fix_build_system.patch b/dev-lang/julia/files/julia-9999-fix_build_system.patch index d7866f46b3e0..336d6e3e590c 100644 --- a/dev-lang/julia/files/julia-9999-fix_build_system.patch +++ b/dev-lang/julia/files/julia-9999-fix_build_system.patch @@ -1,8 +1,17 @@ diff --git a/Make.inc b/Make.inc -index e77681669..bc17c6fd0 100644 +index 8cb2c1014..d3be9de8e 100644 --- a/Make.inc +++ b/Make.inc -@@ -399,7 +399,7 @@ ifneq ($(OS), WINNT) +@@ -178,7 +178,7 @@ USE_GPL_LIBS ?= 1 + # Directories where said libraries get installed to + prefix ?= $(BUILDROOT)/julia-$(JULIA_COMMIT) + bindir := $(prefix)/bin +-libdir := $(prefix)/lib ++libdir := $(prefix)/GENTOOLIBDIR + libexecdir := $(prefix)/libexec + datarootdir := $(prefix)/share + docdir := $(datarootdir)/doc/julia +@@ -410,7 +410,7 @@ ifneq ($(OS), WINNT) JCXXFLAGS += -pedantic endif DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector-all @@ -11,7 +20,7 @@ index e77681669..bc17c6fd0 100644 endif ifeq ($(USECLANG),1) -@@ -410,7 +410,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 +@@ -421,7 +421,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 JCPPFLAGS := -fasynchronous-unwind-tables JCXXFLAGS := -pipe $(fPIC) -fno-rtti -pedantic DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all @@ -20,7 +29,7 @@ index e77681669..bc17c6fd0 100644 ifeq ($(OS), Darwin) ifeq ($(USE_LIBCPP), 1) MACOSX_VERSION_MIN := 10.8 -@@ -439,7 +439,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 +@@ -450,7 +450,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 JCPPFLAGS := JCXXFLAGS := -pipe $(fPIC) -fno-rtti DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all @@ -30,10 +39,10 @@ index e77681669..bc17c6fd0 100644 ifeq ($(USECCACHE), 1) diff --git a/doc/Makefile b/doc/Makefile -index 743804d8b..e06dde030 100644 +index 89b79880d..c3125fde1 100644 --- a/doc/Makefile +++ b/doc/Makefile -@@ -25,7 +25,7 @@ deps: UnicodeData.txt +@@ -29,7 +29,7 @@ deps: UnicodeData.txt $(JLCHECKSUM) UnicodeData.txt clean: @@ -43,13 +52,14 @@ index 743804d8b..e06dde030 100644 cleanall: clean diff --git a/src/Makefile b/src/Makefile -index d3ff98900..9c4d889b4 100644 +index 257152d24..240a4a350 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -87,14 +87,7 @@ PUBLIC_HEADERS += $(LIBUV_INC)/uv* +@@ -85,16 +85,7 @@ UV_HEADERS += uv/*.h endif - PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLIC_HEADERS))) + PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLIC_HEADERS)) $(UV_HEADERS)) +-ifeq ($(JULIACODEGEN),LLVM) -# In LLVM < 3.4, --ldflags includes both options and libraries, so use it both before and after --libs -# In LLVM >= 3.4, --ldflags has only options, and --system-libs has the libraries. -ifneq ($(USE_LLVM_SHLIB),1) @@ -58,6 +68,7 @@ index d3ff98900..9c4d889b4 100644 -LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM -FLAGS += -DLLVM_SHLIB -endif # USE_LLVM_SHLIB == 1 +-endif +LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs) COMMON_LIBS := -L$(build_shlibdir) -L$(build_libdir) $(LIBUV) $(LIBUTF8PROC) $(NO_WHOLE_ARCHIVE) $(LLVMLINK) $(OSLIBS) diff --git a/dev-lang/julia/julia-0.6.2.ebuild b/dev-lang/julia/julia-0.6.2.ebuild deleted file mode 100644 index d1600435e50c..000000000000 --- a/dev-lang/julia/julia-0.6.2.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -RESTRICT="test" - -inherit llvm pax-utils toolchain-funcs - -DESCRIPTION="High-performance programming language for technical computing" -HOMEPAGE="https://julialang.org/" -SRC_URI=" - https://github.com/JuliaLang/${PN}/releases/download/v${PV}/${P}.tar.gz - https://dev.gentoo.org/~tamiko/distfiles/${P}-bundled.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -# julia 0.6* is compatible with llvm-4 -RDEPEND=" - sys-devel/llvm:4= - sys-devel/clang:4=" -LLVM_MAX_SLOT=4 - -RDEPEND+=" - dev-libs/double-conversion:0= - dev-libs/gmp:0= - dev-libs/libgit2:0= - dev-libs/mpfr:0= - dev-libs/openspecfun - sci-libs/arpack:0= - sci-libs/camd:0= - sci-libs/cholmod:0= - sci-libs/fftw:3.0=[threads] - sci-libs/openlibm:0= - sci-libs/spqr:0= - >=dev-libs/libpcre2-10.23:0=[jit] - sci-libs/umfpack:0= - sci-mathematics/glpk:0= - >=sys-libs/libunwind-1.1:7= - !~sys-libs/libunwind-1.2.1 - sys-libs/readline:0= - sys-libs/zlib:0= - >=virtual/blas-3.6 - virtual/lapack" - -DEPEND="${RDEPEND} - dev-vcs/git - dev-util/patchelf - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-0.6.0-fix_build_system.patch -) - -src_prepare() { - mv "${WORKDIR}"/bundled/UnicodeData.txt doc || die - mkdir deps/srccache || die - mv "${WORKDIR}"/bundled/* deps/srccache || die - rmdir "${WORKDIR}"/bundled || die - - default - - # Sledgehammer: - # - prevent fetching of bundled stuff in compile and install phase - # - respect CFLAGS - # - respect EPREFIX and Gentoo specific paths - # - fix BLAS and LAPACK link interface - - sed -i \ - -e 's|$(JLDOWNLOAD)|${EPREFIX}/bin/true|' \ - -e 's|git submodule|${EPREFIX}/bin/true|g' \ - -e "s|GENTOOCFLAGS|${CFLAGS}|g" \ - -e "s|/usr/include|${EPREFIX%/}/usr/include|g" \ - deps/Makefile || die - - local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)" - libblas="${libblas%% *}" - libblas="lib${libblas#-l}" - local liblapack="$($(tc-getPKG_CONFIG) --libs-only-l lapack)" - liblapack="${liblapack%% *}" - liblapack="lib${liblapack#-l}" - - sed -i \ - -e "s|\(JULIA_EXECUTABLE = \)\(\$(JULIAHOME)/julia\)|\1 LD_LIBRARY_PATH=\$(BUILD)/$(get_libdir) \2|" \ - -e "s|GENTOOCFLAGS|${CFLAGS}|g" \ - -e "s|LIBDIR = lib|LIBDIR = $(get_libdir)|" \ - -e "s|/usr/lib|${EPREFIX}/usr/$(get_libdir)|" \ - -e "s|/usr/include|${EPREFIX}/usr/include|" \ - -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|" \ - -e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \ - -e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \ - -e "s|= libblas|= ${libblas}|" \ - -e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \ - -e "s|= liblapack|= ${liblapack}|" \ - Make.inc || die - - sed -i \ - -e "s|,lib)|,$(get_libdir))|g" \ - -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \ - Makefile || die - - sed -i \ - -e "s|ar -rcs|$(tc-getAR) -rcs|g" \ - src/Makefile || die - - # disable doc install starting git fetching - sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die -} - -src_configure() { - # julia does not play well with the system versions of dsfmt, libuv, - # and utf8proc - - # USE_SYSTEM_LIBM=0 implies using external openlibm - cat <<-EOF > Make.user - USE_SYSTEM_DSFMT=0 - USE_SYSTEM_LIBUV=0 - USE_SYSTEM_PCRE=1 - USE_SYSTEM_RMATH=0 - USE_SYSTEM_UTF8PROC=0 - USE_LLVM_SHLIB=1 - USE_SYSTEM_ARPACK=1 - USE_SYSTEM_BLAS=1 - USE_SYSTEM_FFTW=1 - USE_SYSTEM_GMP=1 - USE_SYSTEM_GRISU=1 - USE_SYSTEM_LAPACK=1 - USE_SYSTEM_LIBGIT2=1 - USE_SYSTEM_LIBM=0 - USE_SYSTEM_LIBUNWIND=1 - USE_SYSTEM_LLVM=1 - USE_SYSTEM_MPFR=1 - USE_SYSTEM_OPENLIBM=1 - USE_SYSTEM_OPENSPECFUN=1 - USE_SYSTEM_PATCHELF=1 - USE_SYSTEM_READLINE=1 - USE_SYSTEM_SUITESPARSE=1 - USE_SYSTEM_ZLIB=1 - VERBOSE=1 - libdir="${EROOT}/usr/$(get_libdir)" - EOF - -} - -src_compile() { - - # Julia accesses /proc/self/mem on Linux - addpredict /proc/self/mem - - emake cleanall - emake VERBOSE=1 julia-release \ - prefix="${EPREFIX}/usr" DESTDIR="${D}" \ - CC="$(tc-getCC)" CXX="$(tc-getCXX)" - pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}') - emake -} - -src_test() { - emake test -} - -src_install() { - # Julia is special. It tries to find a valid git repository (that would - # normally be cloned during compilation/installation). Just make it - # happy... - git init && \ - git config --local user.email "whatyoudoing@example.com" && \ - git config --local user.name "Whyyyyyy" && \ - git commit -a --allow-empty -m "initial" || die "git failed" - - emake install \ - prefix="${EPREFIX}/usr" DESTDIR="${D}" \ - CC="$(tc-getCC)" CXX="$(tc-getCXX)" - cat > 99julia <<-EOF - LDPATH=${EROOT%/}/usr/$(get_libdir)/julia - EOF - doenvd 99julia - - dodoc README.md - - mv "${ED}"/usr/etc/julia "${ED}"/etc || die - rmdir "${ED}"/usr/etc || die - mv "${ED}"/usr/share/doc/julia/{examples,html} \ - "${ED}"/usr/share/doc/${PF} || die - rmdir "${ED}"/usr/share/doc/julia || die - if [[ $(get_libdir) != lib ]]; then - mkdir -p "${ED}"/usr/$(get_libdir) || die - mv "${ED}"/usr/lib/julia "${ED}"/usr/$(get_libdir)/julia || die - fi -} diff --git a/dev-lang/julia/julia-0.6.3-r1.ebuild b/dev-lang/julia/julia-0.6.3-r1.ebuild new file mode 100644 index 000000000000..163fa629a208 --- /dev/null +++ b/dev-lang/julia/julia-0.6.3-r1.ebuild @@ -0,0 +1,186 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +RESTRICT="test" + +inherit llvm pax-utils toolchain-funcs + +DESCRIPTION="High-performance programming language for technical computing" +HOMEPAGE="https://julialang.org/" +SRC_URI=" + https://github.com/JuliaLang/${PN}/releases/download/v${PV}/${P}.tar.gz + https://dev.gentoo.org/~tamiko/distfiles/${P}-bundled.tar.gz +" + +S="${WORKDIR}/julia" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +# julia 0.6* is compatible with llvm-4 +RDEPEND=" + sys-devel/llvm:4= + sys-devel/clang:4=" +LLVM_MAX_SLOT=4 + +RDEPEND+=" + dev-libs/double-conversion:0= + dev-libs/gmp:0= + dev-libs/libgit2:0= + dev-libs/mpfr:0= + dev-libs/openspecfun + sci-libs/arpack:0= + sci-libs/camd:0= + sci-libs/cholmod:0= + sci-libs/fftw:3.0=[threads] + sci-libs/openlibm:0= + sci-libs/spqr:0= + >=dev-libs/libpcre2-10.23:0=[jit] + sci-libs/umfpack:0= + sci-mathematics/glpk:0= + >=sys-libs/libunwind-1.1:7= + sys-libs/readline:0= + sys-libs/zlib:0= + >=virtual/blas-3.6 + virtual/lapack" + +DEPEND="${RDEPEND} + dev-vcs/git + dev-util/patchelf + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-0.6.3-fix_build_system.patch +) + +src_prepare() { + mv "${WORKDIR}"/bundled/UnicodeData.txt doc || die + mkdir deps/srccache || die + mv "${WORKDIR}"/bundled/* deps/srccache || die + rmdir "${WORKDIR}"/bundled || die + + default + + # Sledgehammer: + # - prevent fetching of bundled stuff in compile and install phase + # - respect CFLAGS + # - respect EPREFIX and Gentoo specific paths + # - fix BLAS and LAPACK link interface + + sed -i \ + -e 's|git submodule|${EPREFIX}/bin/true|g' \ + -e "s|GENTOOCFLAGS|${CFLAGS}|g" \ + -e "s|/usr/include|${EPREFIX%/}/usr/include|g" \ + deps/Makefile || die + + local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)" + libblas="${libblas%% *}" + libblas="lib${libblas#-l}" + local liblapack="$($(tc-getPKG_CONFIG) --libs-only-l lapack)" + liblapack="${liblapack%% *}" + liblapack="lib${liblapack#-l}" + + sed -i \ + -e "s|GENTOOCFLAGS|${CFLAGS}|g" \ + -e "s|GENTOOLIBDIR|$(get_libdir)|" \ + -e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \ + -e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \ + -e "s|= libblas|= ${libblas}|" \ + -e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \ + -e "s|= liblapack|= ${liblapack}|" \ + Make.inc || die + + sed -i \ + -e "s|,lib)|,$(get_libdir))|g" \ + -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \ + Makefile || die + + sed -i \ + -e "s|ar -rcs|$(tc-getAR) -rcs|g" \ + src/Makefile || die + + # disable doc install starting git fetching + sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die +} + +src_configure() { + # julia does not play well with the system versions of dsfmt, libuv, + # and utf8proc + + # USE_SYSTEM_LIBM=0 implies using external openlibm + cat <<-EOF > Make.user + USE_SYSTEM_DSFMT=0 + USE_SYSTEM_LIBUV=0 + USE_SYSTEM_PCRE=1 + USE_SYSTEM_RMATH=0 + USE_SYSTEM_UTF8PROC=0 + USE_LLVM_SHLIB=1 + USE_SYSTEM_ARPACK=1 + USE_SYSTEM_BLAS=1 + USE_SYSTEM_FFTW=1 + USE_SYSTEM_GMP=1 + USE_SYSTEM_GRISU=1 + USE_SYSTEM_LAPACK=1 + USE_SYSTEM_LIBGIT2=1 + USE_SYSTEM_LIBM=0 + USE_SYSTEM_LIBUNWIND=1 + USE_SYSTEM_LLVM=1 + USE_SYSTEM_MPFR=1 + USE_SYSTEM_OPENLIBM=1 + USE_SYSTEM_OPENSPECFUN=1 + USE_SYSTEM_PATCHELF=1 + USE_SYSTEM_READLINE=1 + USE_SYSTEM_SUITESPARSE=1 + USE_SYSTEM_ZLIB=1 + VERBOSE=1 + libdir="${EROOT}/usr/$(get_libdir)" + EOF + +} + +src_compile() { + + # Julia accesses /proc/self/mem on Linux + addpredict /proc/self/mem + + emake cleanall + emake VERBOSE=1 julia-release \ + prefix="${EPREFIX}/usr" DESTDIR="${D}" \ + CC="$(tc-getCC)" CXX="$(tc-getCXX)" + pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}') + emake +} + +src_test() { + emake test +} + +src_install() { + # Julia is special. It tries to find a valid git repository (that would + # normally be cloned during compilation/installation). Just make it + # happy... + git init && \ + git config --local user.email "whatyoudoing@example.com" && \ + git config --local user.name "Whyyyyyy" && \ + git commit -a --allow-empty -m "initial" || die "git failed" + + emake install \ + prefix="${EPREFIX}/usr" DESTDIR="${D}" \ + CC="$(tc-getCC)" CXX="$(tc-getCXX)" + cat > 99julia <<-EOF + LDPATH=${EROOT%/}/usr/$(get_libdir)/julia + EOF + doenvd 99julia + + dodoc README.md + + mv "${ED}"/usr/etc/julia "${ED}"/etc || die + rmdir "${ED}"/usr/etc || die + mv "${ED}"/usr/share/doc/julia/{examples,html} \ + "${ED}"/usr/share/doc/${PF} || die + rmdir "${ED}"/usr/share/doc/julia || die +} diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild index 8e0c10fd4268..ee966c94ec4b 100644 --- a/dev-lang/julia/julia-9999.ebuild +++ b/dev-lang/julia/julia-9999.ebuild @@ -51,9 +51,7 @@ PATCHES=( ) src_prepare() { - epatch "${PATCHES[@]}" - - eapply_user + default # Sledgehammer: # - respect CFLAGS @@ -73,12 +71,8 @@ src_prepare() { liblapack="lib${liblapack#-l}" sed -i \ - -e "s|\(JULIA_EXECUTABLE = \)\(\$(JULIAHOME)/julia\)|\1 LD_LIBRARY_PATH=\$(BUILD)/$(get_libdir) \2|" \ -e "s|GENTOOCFLAGS|${CFLAGS}|g" \ - -e "s|LIBDIR = lib|LIBDIR = $(get_libdir)|" \ - -e "s|/usr/lib|${EPREFIX}/usr/$(get_libdir)|" \ - -e "s|/usr/include|${EPREFIX}/usr/include|" \ - -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|" \ + -e "s|GENTOOLIBDIR|$(get_libdir)|" \ -e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \ -e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \ -e "s|= libblas|= ${libblas}|" \ @@ -164,8 +158,4 @@ src_install() { mv "${ED}"/usr/share/doc/julia/{examples,html} \ "${ED}"/usr/share/doc/${PF} || die rmdir "${ED}"/usr/share/doc/julia || die - if [[ $(get_libdir) != lib ]]; then - mkdir -p "${ED}"/usr/$(get_libdir) || die - mv "${ED}"/usr/lib/julia "${ED}"/usr/$(get_libdir)/julia || die - fi } diff --git a/dev-lang/julia/metadata.xml b/dev-lang/julia/metadata.xml index 15cc66a9d03c..16bdb691a738 100644 --- a/dev-lang/julia/metadata.xml +++ b/dev-lang/julia/metadata.xml @@ -1,14 +1,14 @@ - - patrick@gentoo.org - Patrick Lauer - sci@gentoo.org Gentoo Science Project + + patrick@gentoo.org + Patrick Lauer + Julia is a high-level, high-performance dynamic programming language for technical computing, with syntax that is familiar to users of other -- cgit v1.2.3