Merge branch 'sds/fix_1.6' of github.com:simeonschaub/julia-feedstock…

… into sds/fix_1.6

.ci_support/linux_64_.yaml

@@ -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:

.ci_support/osx_64_.yaml

@@ -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:

recipe/build.sh

@@ -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 \

recipe/meta.yaml

@@ -30,7 +30,7 @@ requirements:
     - gmp
     - mpfr
     - curl
-    - libgit2
+    - libgit2  # [not osx]
     - libssh2
     - libosxunwind  # [osx]
     - libunwind  # [linux]
@@ -53,7 +53,7 @@ requirements:
     - suitesparse
     - pcre2
     - curl
-    - libgit2
+    - libgit2  # [not osx]
     - libssh2
     - git
     - libnghttp2