From ee0eb7f58bc7d5bff6aa744b1fc5f50bd8309cf3 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Fri, 22 Jan 2016 11:12:21 -0600 Subject: [PATCH] dev-lang/julia: Set up blas/lapack dependencies correctly, bug 572546 Package-Manager: portage-2.2.26 --- dev-lang/julia/julia-0.4.3.ebuild | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dev-lang/julia/julia-0.4.3.ebuild b/dev-lang/julia/julia-0.4.3.ebuild index f0b4381e02e2..c6f50bdae5e5 100644 --- a/dev-lang/julia/julia-0.4.3.ebuild +++ b/dev-lang/julia/julia-0.4.3.ebuild @@ -74,10 +74,12 @@ src_prepare() { -e "s|/usr/include|${EPREFIX%/}/usr/include|g" \ deps/Makefile || die - local lblas="$($(tc-getPKG_CONFIG) --libs blas)" - lblas=${lblas%% *} - local llapack="$($(tc-getPKG_CONFIG) --libs lapack)" - llapack=${llapack%% *} + 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|" \ @@ -87,10 +89,10 @@ src_prepare() { -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|${lblas}|" \ - -e "s|= libblas|= lib${lblas#-l}|" \ - -e "s|-llapack|${llapack}|" \ - -e "s|= liblapack|= lib${llapack#-l}|" \ + -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 \ -- 2.26.2