Skip to content

Commit

Permalink
Merge branch 'sds/fix_1.6' of github.com:simeonschaub/julia-feedstock…
Browse files Browse the repository at this point in the history
… into sds/fix_1.6
  • Loading branch information
mkitti committed Aug 5, 2021
2 parents 2da0e10 + c9bdf28 commit 04d3113
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 29 deletions.
18 changes: 8 additions & 10 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,31 +18,29 @@ cxx_compiler_version:
- '9'
docker_image:
- quay.io/condaforge/linux-anvil-comp7
fftw:
- '3'
fortran_compiler:
- gfortran
fortran_compiler_version:
- '9'
gmp:
- '6'
libblas:
- 3.8 *netlib
libcblas:
- 3.8 *netlib
liblapack:
- 3.8 *netlib
libgit2:
- '1.1'
libssh2:
- '1'
libunwind:
- '1'
mpfr:
- '4'
pcre2:
- '10.37'
perl:
- 5.26.2
pin_run_as_build:
arpack:
max_pin: x.x.x
curl:
max_pin: x
fftw:
max_pin: x
gmp:
max_pin: x
mpfr:
Expand Down
7 changes: 0 additions & 7 deletions .ci_support/migrations/pcre21037.yaml

This file was deleted.

16 changes: 6 additions & 10 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,33 +16,29 @@ cxx_compiler:
- clangxx
cxx_compiler_version:
- '11'
fftw:
- '3'
fortran_compiler:
- gfortran
fortran_compiler_version:
- '9'
gmp:
- '6'
libblas:
- 3.8 *netlib
libcblas:
- 3.8 *netlib
liblapack:
- 3.8 *netlib
libgit2:
- '1.1'
libssh2:
- '1'
macos_machine:
- x86_64-apple-darwin13.4.0
mpfr:
- '4'
pcre2:
- '10.37'
perl:
- 5.26.2
pin_run_as_build:
arpack:
max_pin: x.x.x
curl:
max_pin: x
fftw:
max_pin: x
gmp:
max_pin: x
mpfr:
Expand Down
1 change: 1 addition & 0 deletions recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ then
export EXTRA_MAKEFLAGS="USE_SYSTEM_LIBGIT2=1"
fi

# using system utf8proc can be enabled in 1.7.0. See https://github.com/JuliaLang/julia/commit/ba653ecb1c81f1465505c2cea38b4f8149dd20b3
make -j 4 prefix=${PREFIX} MARCH=core2 sysconfigdir=${PREFIX}/etc \
LIBBLAS=-lopenblas64_ LIBBLASNAME=libopenblas64_ LIBLAPACK=-lopenblas64_ LIBLAPACKNAME=libopenblas64_ \
USE_SYSTEM_ARPACK=1 \
Expand Down
4 changes: 2 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ requirements:
- gmp
- mpfr
- curl
- libgit2
- libgit2 # [not osx]
- libssh2
- libosxunwind # [osx]
- libunwind # [linux]
Expand All @@ -53,7 +53,7 @@ requirements:
- suitesparse
- pcre2
- curl
- libgit2
- libgit2 # [not osx]
- libssh2
- git
- libnghttp2
Expand Down

0 comments on commit 04d3113

Please sign in to comment.