diff options
Diffstat (limited to 'dev-lang/julia')
-rw-r--r-- | dev-lang/julia/Manifest | 9 | ||||
-rw-r--r-- | dev-lang/julia/files/julia-1.0.3-fix_build_system.patch | 87 | ||||
-rw-r--r-- | dev-lang/julia/files/julia-1.1.0-fix_llvm_install.patch | 15 | ||||
-rw-r--r-- | dev-lang/julia/julia-1.0.3.ebuild | 199 | ||||
-rw-r--r-- | dev-lang/julia/julia-1.1.0.ebuild (renamed from dev-lang/julia/julia-1.1.0_rc1.ebuild) | 3 |
5 files changed, 20 insertions, 293 deletions
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest index bca20905a242..ca343d1f0162 100644 --- a/dev-lang/julia/Manifest +++ b/dev-lang/julia/Manifest @@ -1,15 +1,12 @@ -AUX julia-1.0.3-fix_build_system.patch 3227 BLAKE2B 55c76b8f3af9755517e8e4a797ad259004c4fb714315eb0001ffcc008d304dbfe8a008b2701435b5073f92a96e879eb8cf8e3b1c20ca62cade3b42c83f5944fb SHA512 8b5c2448fd75d84e7670de7d50ff2c258d4aa750ef07a2c1eaa11f8874793024af163c3526bdbd65efa1045acda8f0ebbcffe94a6018051ac9de59bf4168ec8f AUX julia-1.1.0-fix_build_system.patch 1651 BLAKE2B 62123d16fe25bd6d77ac7af05297bc2cb5529b58943fcd13060f0b2b3f329571ebbd82208793651ac5120cd4ed19b6eca6c3d0c829509288460a9e0e78817b48 SHA512 70f5cf43261216e16001acc2c64e0bc1457e1fd48a918b218f8b0b21877a44c274f3aad81f68f7176665ec94c2d17f89a880e1c0a9332beae9d25668f9a85a25 +AUX julia-1.1.0-fix_llvm_install.patch 680 BLAKE2B ca0d95c503b8f6e76722d54147f7a64cda5781cefc6e05ed7cfc631b356c3131d43ce6703da6c61b791da08836d9a6b5b494556c2a0ecba8960f8a9395b2d66a SHA512 4d474c1ab1d74aeb98367d55ec557e22e43a3e3d35615b7cde20fb9a194b94f24237735ad431800ded6e120beae9d2d3706b778ea7f26409790e3649ba39117b AUX julia-9999-fix_build_system.patch 3345 BLAKE2B 0a8eeaa3590beb0215c9f696a7dd1d6c614238dbf12f72cd2ccc81a36bfc3bdaae22afe45d95b1868bd211a67c3c483889dfa2feae86816054101c0a6865394f SHA512 edc7fdd6f6844a359368e2356dafabe951304a7b3f144d4a5181003de8f3f2eefc9b8882db6dcd65c049226a2505446d900eda3056e3c6bbe45fbaea3bd3a647 -DIST julia-1.0.3.tar.gz 7460268 BLAKE2B d9d42e0235f249fa8c1ced12c659091b97d338ec4a4662ea13ea6a107cb59e90d8385c51962199e47dae5f9770156be2db2d8bb2e3cc8f42aa7403b4f4ca7f04 SHA512 b61399c7b7ffae828264a6ec916b409b2cbc6b3b98d9a6d39b60b014a97a1f1ad75e1ed4860d9ab15d1e5ffec691c04d1b797c238953290770b7313790ae3f1d -DIST julia-1.1.0-rc1.tar.gz 7672785 BLAKE2B 3c49e189bec2da8d6d3f4c689600aa42e8092fe4343175981f8d998407bc6ef6c1bee20d579dc21594c2e9f9469898fc59d28807202b394cf64678b497037e0e SHA512 ceba088ef7abe103a34b1eb6f3b9660165bac038e62d4def22ba207c1c6fddb8a90625b3aa967c32dcad5c24dd83a8f25781347fc8b4078f40dcdffd07b554ce +DIST julia-1.1.0.tar.gz 7681396 BLAKE2B 2038901132bab1ae5ea634e15de2e18771e250c77e967228858f078a6e44e3f1900c1ea464b5db762842f65c4ad8590b70ba6b0b267bf955e86fa7f16a812696 SHA512 da546430df5a9207926faa3fe7b1d2c193a1223a379ce1ff25219c6f4f2d650497d1b0e9091f1cd542fa19bfcf7bf1ee74a52f7d45a06fd8ab4441a5ac4d4a46 DIST julia-dsfmt-2.2.3.tar.gz 291773 BLAKE2B 6ffae90494d72527920c80fc0fb005da1c7b84f8a03a7ecb0789434c0fff97359e5098e85431896dffccc7d5148c414e847aaba5feef648b8788421a466ff65e SHA512 6d8ddcd01aab3f9039f4f0288a8af53e290cc2f293ed8c4a8c9f3b3f12398e7eedfce8016117b425766ba89c61c86c13b3e420035b5f9bf91315b8b814c03662 DIST julia-libuv-2348256acf5759a544e5ca7935f638d2bc091d60.tar.gz 1555710 BLAKE2B 31ce57d23765c142799dd985a5511751d63238cf7e082fd1ad5574bf62201e9d6cb53b8da5dcc724765ccb4abd63da3ca6d6cbd45e078310c2ffa3859d09b8e4 SHA512 c8bf3c736a60feb0c6994aa7cd1b80e1a45bd6096aa66db320ddfc27b59a0797d303338ea75978619173e4f0a680254f3db29c9f6d1b84361030cc11c7729c98 -DIST julia-libuv-ed3700c849289ed01fe04273a7bf865340b2bd7e.tar.gz 1492695 BLAKE2B ad03512dd1db2c7066b46b5a3a314645b925481d8ace09ac0a0ae23cf5b8a64338ad457f8df229aa82f1d45605b5366883f563f2e22756ce28bb6fb7607d7124 SHA512 1305035b1372bdf234e3c5e673ee4c8ab5bda83ff06bc27704786def52667c3143fe587fca8f6e0855ba0c8b6d4dd90b2faefd33736224173f459d751885683e DIST julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz 4183 BLAKE2B c932e23b1b476d3fd16cf6f451efd5fc6d9c1ec2c53e8ac086340a100817d9b30dae3eff50b284a42c09b2bbae30b9e2fd38b2881f8cbf4974a89f3bd0c87599 SHA512 6fb77b715d70d9bc95a8546c3bf97bd3677c7ea344b88bb5bc3bbfac9dceabe8a8cde7a0f64dec884cde802e4a3000e30837d3f824b5a9242348c4fe061526a3 DIST julia-llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9 DIST julia-utf8proc-97ef668b312b96382714dbb8eaac4affce0816e6.tar.gz 156361 BLAKE2B e5e1485b758e959ed78f7fde8b211376da2365e5835708042de57c091b10b59755e1203a9f88c0d761687bf3d166207410de6ec203d80fef4dbdf06a50404cd1 SHA512 1c80dc6e71fdad187b142d02e561dfe1880857baaec08d36240ecb2f275d1bc5467aace84eebe5a10fd3f4c40b0035e65a5db3ec2a9ee6940920b0aad6221c55 -EBUILD julia-1.0.3.ebuild 5236 BLAKE2B 83945df39251e32a57b3681f60dbc5faad8f67f104a51ea06e8416a46e34816d496f48c1e874ba0f03fb79f9e424e551441a763b3f4d67ed55f1a8da5ccc1bf9 SHA512 61dc15a6f0f7bdfec0e1371b8193965170f3c261e69cb3ce71748e654ce2602200c9b5ba69fe0ec23cbe175b85f9d7784f95a02f59f570e88ff01d1ceaa1cdbc -EBUILD julia-1.1.0_rc1.ebuild 5250 BLAKE2B 8471f259d84a4ec26fd7e2b92646be12204ed852241525f080b1e3f95dfd8875bc7aec1611f2b37c80e48bb2e09d2309c556d9422ea5d7aae61a4aee16a80d10 SHA512 28d410c469011982fc578f9b5c258a1407463b6b5f6e114fdeb3ee80ea3cb32541728e2d697cda8f6c35f51137a7ae65d10b10e44c5d449b057173c63986acf4 +EBUILD julia-1.1.0.ebuild 5311 BLAKE2B bb91bb9f04f2219968c7b7c03519cd37c8a4cb463291462ac643858df768dde1a3de55c7734fb04b05363ac9543a55bb7cdcfe4a67f4b470436c9126f55924f0 SHA512 f44bf3ff372223a677c26ebdefe57925ce5cf560454473cae9d31ee55f25a1008011e00b2d42d77279a9386a3d0eb511783968703505f8f693b5a052dbc2700b EBUILD julia-9999.ebuild 4089 BLAKE2B b38fb0ae040da02961650abdaf40ec17632899cd63aeee83f0b1bb67a760d68ea80a251e29baf594b15b944017ae894db607a4179ef025fb18fb5fbaecae53c3 SHA512 dfb930b357f61479cb28d4d1c5f08fe264ac8ebcd4cd41a0da4c947209b6318cad25bf011e45ea1db3575dcf667f694119a8b40f7ad181914309cd0b93467729 MISC metadata.xml 1291 BLAKE2B 98782d71b9f74e628e4e6dc5264b7bcddfb61f4ce42c4e3baa0a2ec0cc6e2ef6368d1c2b1d755972b214823533c3935b4558c79bd920072649d9072b985efcd4 SHA512 0bbe350eef4d0daaa4a971b843b4359d2513dea5e2dc9e8a3b6241ff403c043f605634615c39a3fdb2a4d090851a19d6b20ebd5c7b3886f009ade3b5c16dfaaf diff --git a/dev-lang/julia/files/julia-1.0.3-fix_build_system.patch b/dev-lang/julia/files/julia-1.0.3-fix_build_system.patch deleted file mode 100644 index 98f4fc5c754a..000000000000 --- a/dev-lang/julia/files/julia-1.0.3-fix_build_system.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff --git a/Make.inc b/Make.inc -index e5c102f..c4c6640 100644 ---- a/Make.inc -+++ b/Make.inc -@@ -181,7 +181,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 -@@ -413,7 +413,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) -@@ -424,7 +424,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 -@@ -453,7 +453,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/base/Makefile b/base/Makefile -index 21c7ad4..737e40d 100644 ---- a/base/Makefile -+++ b/base/Makefile -@@ -207,7 +207,6 @@ $(build_private_libdir)/libLLVM.dylib: - ln -sf "$$REALPATH" "$@" - ifneq ($(USE_SYSTEM_LLVM),0) - ifneq ($(USE_LLVM_SHLIB),0) --SYMLINK_SYSTEM_LIBRARIES += symlink_libLLVM - endif - endif - -diff --git a/doc/Makefile b/doc/Makefile -index 3d07733..8bd3bc0 100644 ---- a/doc/Makefile -+++ b/doc/Makefile -@@ -29,7 +29,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 20da34d..84eae21 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -88,16 +88,7 @@ UV_HEADERS += uv/*.h - endif - 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) --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 --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) - 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-1.1.0-fix_llvm_install.patch b/dev-lang/julia/files/julia-1.1.0-fix_llvm_install.patch new file mode 100644 index 000000000000..9cb75188b963 --- /dev/null +++ b/dev-lang/julia/files/julia-1.1.0-fix_llvm_install.patch @@ -0,0 +1,15 @@ +--- a/deps/llvm.mk 2019-02-09 10:09:30.102927517 +0300 ++++ b/deps/llvm.mk 2019-02-09 10:10:51.479924878 +0300 +@@ -464,10 +464,11 @@ + + $(build_prefix)/manifest/llvm: | $(llvm_python_workaround) + ++# unset DESTDIR to fix https://github.com/JuliaLang/julia/issues/23462 + LLVM_INSTALL = \ + cd $1 && mkdir -p $2$$(build_depsbindir) && \ + cp -r $$(LLVM_SRC_DIR)/utils/lit $2$$(build_depsbindir)/ && \ +- $$(CMAKE) -DCMAKE_INSTALL_PREFIX="$2$$(build_prefix)" -P cmake_install.cmake ++ DESTDIR="" $$(CMAKE) -DCMAKE_INSTALL_PREFIX="$2$$(build_prefix)" -P cmake_install.cmake + ifeq ($(OS), WINNT) + LLVM_INSTALL += && cp $2$$(build_shlibdir)/LLVM.dll $2$$(build_depsbindir) + endif diff --git a/dev-lang/julia/julia-1.0.3.ebuild b/dev-lang/julia/julia-1.0.3.ebuild deleted file mode 100644 index 1194c9009642..000000000000 --- a/dev-lang/julia/julia-1.0.3.ebuild +++ /dev/null @@ -1,199 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -RESTRICT="test" - -inherit llvm pax-utils toolchain-funcs - -MY_LIBUV_V="ed3700c849289ed01fe04273a7bf865340b2bd7e" -MY_UTF8PROC_V="97ef668b312b96382714dbb8eaac4affce0816e6" -MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e" -MY_DSFMT_V="2.2.3" - -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://api.github.com/repos/JuliaLang/libuv/tarball/${MY_LIBUV_V} -> ${PN}-libuv-${MY_LIBUV_V}.tar.gz - https://api.github.com/repos/JuliaLang/utf8proc/tarball/${MY_UTF8PROC_V} -> ${PN}-utf8proc-${MY_UTF8PROC_V}.tar.gz - https://api.github.com/repos/vtjnash/libwhich/tarball/${MY_LIBWHICH_V} -> ${PN}-libwhich-${MY_LIBWHICH_V}.tar.gz - 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 -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -# julia 0.7* needs a patched llvm-6 -RDEPEND=" - =sys-devel/llvm-6*:= - =sys-devel/clang-6*:=" -LLVM_MAX_SLOT=6 - -RDEPEND+=" - dev-libs/double-conversion:0= - dev-libs/gmp:0= - dev-libs/libgit2:0= - >=dev-libs/libpcre2-10.23:0=[jit] - dev-libs/mpfr:0= - dev-libs/openspecfun - sci-libs/amd:0= - sci-libs/arpack:0= - sci-libs/camd:0= - sci-libs/ccolamd:0= - sci-libs/cholmod:0= - sci-libs/colamd:0= - sci-libs/fftw:3.0=[threads] - sci-libs/openlibm:0= - sci-libs/spqr:0= - 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}-1.0.3-fix_build_system.patch -) - -src_unpack() { - tounpack=(${A}) - # the main source tree, followed by deps - unpack "${A/%\ */}" - - mkdir -p "${S}/deps/srccache/" - for i in "${tounpack[@]:1}"; do - cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die - done -} - -src_prepare() { - 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_ARPACK:=1 - USE_SYSTEM_BLAS:=1 - USE_SYSTEM_DSFMT:=0 - 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_LIBUV:=0 - USE_SYSTEM_LLVM:=1 - USE_LLVM_SHLIB:=1 - USE_SYSTEM_MPFR:=1 - USE_SYSTEM_OPENLIBM:=1 - USE_SYSTEM_OPENSPECFUN:=1 - USE_SYSTEM_PATCHELF:=1 - USE_SYSTEM_PCRE:=1 - USE_SYSTEM_READLINE:=1 - USE_SYSTEM_RMATH:=0 - USE_SYSTEM_SUITESPARSE:=1 - USE_SYSTEM_UTF8PROC:=0 - 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 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/html "${ED}"/usr/share/doc/${PF} || die - rmdir "${ED}"/usr/share/doc/julia || die -} diff --git a/dev-lang/julia/julia-1.1.0_rc1.ebuild b/dev-lang/julia/julia-1.1.0.ebuild index 36db882f1ed5..02a71cbbd683 100644 --- a/dev-lang/julia/julia-1.1.0_rc1.ebuild +++ b/dev-lang/julia/julia-1.1.0.ebuild @@ -27,7 +27,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~x86" IUSE="" RDEPEND+=" @@ -61,6 +61,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${PN}-1.1.0-fix_build_system.patch + "${FILESDIR}"/${PN}-1.1.0-fix_llvm_install.patch ) S="${WORKDIR}/${PN}-${MY_PV}" |