Skip to content

Commit

Permalink
Require openspecfun (#26)
Browse files Browse the repository at this point in the history
* Move BLAS and LAPACK flags before System flags

A minor stylistic change that makes it easier to keep all of the
`USE_SYSTEM_*` flags together and extend them without burying them in
the `USE_SYSTEM_*` flags.

* Require openspecfun

This is a dependency of Julia's that is normally built internally.
However it can be built externally and used in the Julia build. In order
to better express Julia's requirements, we break this out and make it an
external dependency of Julia.

For now we pin openspecfun exactly as we are unsure of its compatibility
between versions. Plus we want to make sure it matches what Julia wants
it to be. We can revisit how to pin openspecfun once we know more about
its compatibility.

* Drop gcc and libgcc

Neither of these are needed any more as all the compiled code is now C
or C++. Any portions that use Fortran are now broken out as
dependencies. So the regular system toolchain should be sufficient for
building Julia.

* Bump build number to 4

As this now has a new dependency, openspecfun, and no longer uses the
gcc package, we need to do a rebuild to get a package built with these
changed dependencies.

(cherry picked from commit e257c32)
  • Loading branch information
jakirkham committed Sep 18, 2017
1 parent 9fa9c7b commit 270c46d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ export LIBRARY_PATH=${PREFIX}/lib
export CMAKE_PREFIX_PATH=${PREFIX}

make -j 4 prefix=${PREFIX} MARCH=core2 sysconfigdir=${PREFIX}/etc NO_GIT=1 \
LIBBLAS=-lopenblas LIBBLASNAME=libopenblas.so LIBLAPACK=-lopenblas LIBLAPACKNAME=libopenblas.so \
USE_SYSTEM_LIBGIT2=1 USE_LLVM_SHLIB=0 USE_SYSTEM_CURL=1 USE_SYSTEM_OPENLIBM=1 USE_SYSTEM_MPFR=1 \
USE_SYSTEM_PATCHELF=1 USE_SYSTEM_LIBSSH2=1 USE_SYSTEM_LLVM=0 USE_SYSTEM_BLAS=1 USE_SYSTEM_PCRE=1 \
USE_SYSTEM_FFTW=1 USE_SYSTEM_GMP=1 USE_SYSTEM_LAPACK=1 USE_SYSTEM_ARPACK=1 USE_SYSTEM_SUITESPARSE=1 \
LIBBLAS=-lopenblas LIBBLASNAME=libopenblas.so LIBLAPACK=-lopenblas LIBLAPACKNAME=libopenblas.so \
USE_SYSTEM_OPENSPECFUN=1 \
TAGGED_RELEASE_BANNER="conda-forge-julia release" \
install

Expand Down
6 changes: 3 additions & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@ source:

build:
skip: True # [osx or win]
number: 3
number: 4
features:
- blas_{{ variant }}

requirements:
build:
- gcc # [linux]
- toolchain
- patchelf
- cmake
Expand All @@ -29,6 +28,7 @@ requirements:
- perl 5.20.*
- openblas 0.2.19|0.2.19.*
- openlibm 0.5.4
- openspecfun 0.5.3
- blas 1.1 {{ variant }}
- fftw
- gmp 6.1.*
Expand All @@ -41,13 +41,13 @@ requirements:

run:
- zlib 1.2.8
- libgcc # [linux]
- libgit2
- fftw
- gmp 6.1.*
- mpfr 3.1.*
- openblas 0.2.19|0.2.19.*
- openlibm 0.5.4
- openspecfun 0.5.3
- blas 1.1 {{ variant }}
- arpack
- suitesparse
Expand Down

0 comments on commit 270c46d

Please sign in to comment.