From f9fb9a8c02c76fe8ca8036f286b0fdee5d8cd5f4 Mon Sep 17 00:00:00 2001 From: John Muchovej <5000729+jmuchovej@users.noreply.github.com> Date: Wed, 9 Jun 2021 21:04:23 -0400 Subject: [PATCH 01/34] Upgrade from Julia 1.1.1 to 1.6.1 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 161442db..b5bf9113 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set name = "julia" %} -{% set version = "1.1.1" %} -{% set sha256 = "0155a33448cb2334ae7487a35a2416a4205da4541b90fc9f97208da11e273c9e" %} +{% set version = "1.6.1" %} +{% set sha256 = "2efc3f3485b837d2d77ed684ef883c55c66cb02edbaab7ffd120375cb86317da" %} package: name: {{ name|lower }} @@ -13,7 +13,7 @@ source: build: skip: True # [win] - number: 6 + number: 0 features: requirements: From e59adf19f0d4b85f85d4557a1c926ad3220fbddc Mon Sep 17 00:00:00 2001 From: conda-forge-linter Date: Thu, 10 Jun 2021 01:06:32 +0000 Subject: [PATCH 02/34] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.10.1, and conda-forge-pinning 2021.06.09.12.51.26 --- .ci_support/linux_64_.yaml | 2 +- .ci_support/migrations/pcre2_1036.yaml | 12 ------ .ci_support/osx_64_.yaml | 2 +- .scripts/build_steps.sh | 27 +++++++------ .scripts/logging_utils.sh | 9 ++++- .scripts/run_docker_build.sh | 19 ++++++---- .scripts/run_osx_build.sh | 52 ++++++++++++++++---------- README.md | 1 + build-locally.py | 27 +++++++++++-- 9 files changed, 95 insertions(+), 56 deletions(-) delete mode 100644 .ci_support/migrations/pcre2_1036.yaml diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 3a2a5ab8..770460fe 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -52,7 +52,7 @@ pin_run_as_build: zlib: max_pin: x.x suitesparse: -- '5.6' +- '5' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/migrations/pcre2_1036.yaml b/.ci_support/migrations/pcre2_1036.yaml deleted file mode 100644 index 428b241d..00000000 --- a/.ci_support/migrations/pcre2_1036.yaml +++ /dev/null @@ -1,12 +0,0 @@ -migrator_ts: 1614603878 -__migrator: - kind: - version - migration_number: - 1 - bump_number: - 1 - -pcre2: - - '10.36' - diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index b00e822f..c2447382 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -52,7 +52,7 @@ pin_run_as_build: zlib: max_pin: x.x suitesparse: -- '5.6' +- '5' target_platform: - osx-64 zip_keys: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 522eabcf..71a06860 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -10,9 +10,10 @@ export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}" source ${FEEDSTOCK_ROOT}/.scripts/logging_utils.sh -endgroup "Start Docker" +( endgroup "Start Docker" ) 2> /dev/null + +( startgroup "Configuring conda" ) 2> /dev/null -startgroup "Configuring conda" export PYTHONUNBUFFERED=1 export RECIPE_ROOT="${RECIPE_ROOT:-/home/conda/recipe_root}" export CI_SUPPORT="${FEEDSTOCK_ROOT}/.ci_support" @@ -36,34 +37,38 @@ source run_conda_forge_build_setup # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" -endgroup "Configuring conda" + +( endgroup "Configuring conda" ) 2> /dev/null if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then - startgroup "Running conda debug" if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" fi conda debug "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" - endgroup "Running conda debug" + # Drop into an interactive shell /bin/bash else - startgroup "Running conda $BUILD_CMD" conda $BUILD_CMD "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" - endgroup "Running conda build" - startgroup "Validating outputs" + ( startgroup "Validating outputs" ) 2> /dev/null + validate_recipe_outputs "${FEEDSTOCK_NAME}" - endgroup "Validating outputs" + + ( endgroup "Validating outputs" ) 2> /dev/null + + ( startgroup "Uploading packages" ) 2> /dev/null if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then - startgroup "Uploading packages" upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" - endgroup "Uploading packages" fi + + ( endgroup "Uploading packages" ) 2> /dev/null fi +( startgroup "Final checks" ) 2> /dev/null + touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}" \ No newline at end of file diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh index a53ef3f2..57bc95c2 100644 --- a/.scripts/logging_utils.sh +++ b/.scripts/logging_utils.sh @@ -13,18 +13,23 @@ function startgroup { travis ) echo "$1" echo -en 'travis_fold:start:'"${1// /}"'\\r';; + github_actions ) + echo "::group::$1";; * ) echo "$1";; esac -} +} 2> /dev/null function endgroup { # End a foldable group of log lines # Pass a single argument, quoted + case ${CI:-} in azure ) echo "##[endgroup]";; travis ) echo -en 'travis_fold:end:'"${1// /}"'\\r';; + github_actions ) + echo "::endgroup::";; esac -} +} 2> /dev/null diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 16d6c15a..244ccd1f 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -7,7 +7,7 @@ source .scripts/logging_utils.sh -startgroup "Configure Docker" +( startgroup "Configure Docker" ) 2> /dev/null set -xeo pipefail @@ -52,11 +52,11 @@ if [ -z "${DOCKER_IMAGE}" ]; then echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Trying to parse with coreutils" DOCKER_IMAGE=$(cat .ci_support/${CONFIG}.yaml | grep '^docker_image:$' -A 1 | tail -n 1 | cut -b 3-) if [ "${DOCKER_IMAGE}" = "" ]; then - echo "No docker_image entry found in ${CONFIG}. Falling back to condaforge/linux-anvil-comp7" - DOCKER_IMAGE="condaforge/linux-anvil-comp7" + echo "No docker_image entry found in ${CONFIG}. Falling back to quay.io/condaforge/linux-anvil-comp7" + DOCKER_IMAGE="quay.io/condaforge/linux-anvil-comp7" fi else - DOCKER_IMAGE="$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 )" + DOCKER_IMAGE="$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 quay.io/condaforge/linux-anvil-comp7 )" fi fi @@ -69,9 +69,11 @@ DOCKER_RUN_ARGS="${CONDA_FORGE_DOCKER_RUN_ARGS}" if [ -z "${CI}" ]; then DOCKER_RUN_ARGS="-it ${DOCKER_RUN_ARGS}" fi -endgroup "Configure Docker" -startgroup "Start Docker" +( endgroup "Configure Docker" ) 2> /dev/null + +( startgroup "Start Docker" ) 2> /dev/null + export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" docker run ${DOCKER_RUN_ARGS} \ -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z,delegated \ @@ -94,4 +96,7 @@ docker run ${DOCKER_RUN_ARGS} \ /home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh # verify that the end of the script was reached -test -f "$DONE_CANARY" \ No newline at end of file +test -f "$DONE_CANARY" + +# This closes the last group opened in `build_steps.sh` +( endgroup "Final checks" ) 2> /dev/null \ No newline at end of file diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 614ca844..96d02787 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -2,19 +2,24 @@ source .scripts/logging_utils.sh -set -x +set -xe + +MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} + +( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null -startgroup "Installing a fresh version of Miniforge" MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" MINIFORGE_FILE="Miniforge3-MacOSX-x86_64.sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" -bash $MINIFORGE_FILE -b -endgroup "Installing a fresh version of Miniforge" +bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} + +( endgroup "Installing a fresh version of Miniforge" ) 2> /dev/null + +( startgroup "Configuring conda" ) 2> /dev/null -startgroup "Configuring conda" BUILD_CMD=build -source ${HOME}/miniforge3/etc/profile.d/conda.sh +source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base echo -e "\n\nInstalling conda-forge-ci-setup=3 and conda-build." @@ -24,32 +29,41 @@ conda install -n base --quiet --yes "conda-forge-ci-setup=3" conda-build pip ${G echo -e "\n\nSetting up the condarc and mangling the compiler." setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml -mangle_compiler ./ ./recipe .ci_support/${CONFIG}.yaml -echo -e "\n\nMangling homebrew in the CI to avoid conflicts." -/usr/bin/sudo mangle_homebrew -/usr/bin/sudo -k +if [[ "${CI:-}" != "" ]]; then + mangle_compiler ./ ./recipe .ci_support/${CONFIG}.yaml +fi + +if [[ "${CI:-}" != "" ]]; then + echo -e "\n\nMangling homebrew in the CI to avoid conflicts." + /usr/bin/sudo mangle_homebrew + /usr/bin/sudo -k +else + echo -e "\n\nNot mangling homebrew as we are not running in CI" +fi echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup -endgroup "Configuring conda" -set -e +( endgroup "Configuring conda" ) 2> /dev/null + -startgroup "Running conda $BUILD_CMD" echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml conda $BUILD_CMD ./recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml ${EXTRA_CB_OPTIONS:-} -endgroup "Running conda build" -startgroup "Validating outputs" +( startgroup "Validating outputs" ) 2> /dev/null + validate_recipe_outputs "${FEEDSTOCK_NAME}" -endgroup "Validating outputs" + +( endgroup "Validating outputs" ) 2> /dev/null + +( startgroup "Uploading packages" ) 2> /dev/null if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then - startgroup "Uploading packages" upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml - endgroup "Uploading packages" -fi \ No newline at end of file +fi + +( endgroup "Uploading packages" ) 2> /dev/null \ No newline at end of file diff --git a/README.md b/README.md index 4efbc18b..2d633a3b 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,7 @@ Installing `julia` from the `conda-forge` channel can be achieved by adding `con ``` conda config --add channels conda-forge +conda config --set channel_priority strict ``` Once the `conda-forge` channel has been enabled, `julia` can be installed with: diff --git a/build-locally.py b/build-locally.py index 3453cfe6..00eeb34b 100755 --- a/build-locally.py +++ b/build-locally.py @@ -7,6 +7,7 @@ import glob import subprocess from argparse import ArgumentParser +import platform def setup_environment(ns): @@ -16,6 +17,10 @@ def setup_environment(ns): os.environ["BUILD_WITH_CONDA_DEBUG"] = "1" if ns.output_id: os.environ["BUILD_OUTPUT_ID"] = ns.output_id + if "MINIFORGE_HOME" not in os.environ: + os.environ["MINIFORGE_HOME"] = os.path.join( + os.path.dirname(__file__), "miniforge3" + ) def run_docker_build(ns): @@ -23,6 +28,11 @@ def run_docker_build(ns): subprocess.check_call([script]) +def run_osx_build(ns): + script = ".scripts/run_osx_build.sh" + subprocess.check_call([script]) + + def verify_config(ns): valid_configs = { os.path.basename(f)[:-5] for f in glob.glob(".ci_support/*.yaml") @@ -46,10 +56,16 @@ def verify_config(ns): else: raise ValueError("config " + ns.config + " is not valid") # Remove the following, as implemented - if not ns.config.startswith("linux"): + if ns.config.startswith("win"): raise ValueError( - f"only Linux configs currently supported, got {ns.config}" + f"only Linux/macOS configs currently supported, got {ns.config}" ) + elif ns.config.startswith("osx") and platform.system() == "Darwin": + if "OSX_SDK_DIR" not in os.environ: + raise RuntimeError( + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=/opt'" + "to download the SDK automatically to '/opt/MacOSX.sdk'" + ) def main(args=None): @@ -68,7 +84,12 @@ def main(args=None): verify_config(ns) setup_environment(ns) - run_docker_build(ns) + if ns.config.startswith("linux") or ( + ns.config.startswith("osx") and platform.system() == "Linux" + ): + run_docker_build(ns) + elif ns.config.startswith("osx"): + run_osx_build(ns) if __name__ == "__main__": From c11c2f2e3507f5bb817b826585edd5025949026a Mon Sep 17 00:00:00 2001 From: John Muchovej <5000729+jmuchovej@users.noreply.github.com> Date: Wed, 9 Jun 2021 22:17:02 -0400 Subject: [PATCH 03/34] Attempting hotfix of make cleanall rec'd by azure --- recipe/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/build.sh b/recipe/build.sh index e83f8379..dc6f2a45 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -28,6 +28,7 @@ then export EXTRA_MAKEFLAGS="USE_SYSTEM_LIBUNWIND=0" fi +make cleanall # attempted resolution of build error on PCRE from Azure make -j 4 prefix=${PREFIX} MARCH=core2 sysconfigdir=${PREFIX}/etc NO_GIT=1 \ LIBBLAS=-lblas LIBBLASNAME=libblas LIBLAPACK=-llapack LIBLAPACKNAME=liblapack \ USE_SYSTEM_ARPACK=1 \ From ffeb708cf2ad48439e850ca8b6572eb95f8a186d Mon Sep 17 00:00:00 2001 From: John Muchovej <5000729+jmuchovej@users.noreply.github.com> Date: Wed, 9 Jun 2021 22:38:21 -0400 Subject: [PATCH 04/34] Upgrade PCRE2 to 10.36 Julia uses this in `deps/Versions.make` --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b5bf9113..874af292 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -40,7 +40,7 @@ requirements: - libosxunwind # [osx] - arpack - suitesparse - - pcre2 10.23 + - pcre2 10.36 run: - zlib @@ -54,7 +54,7 @@ requirements: - arpack - suitesparse - curl - - pcre2 10.23 + - pcre2 10.36 test: commands: From a67508e7300e3ad74b10d5cad7c8932c134849c1 Mon Sep 17 00:00:00 2001 From: John Muchovej <5000729+jmuchovej@users.noreply.github.com> Date: Mon, 14 Jun 2021 18:55:52 -0400 Subject: [PATCH 05/34] Attempting to force usage of system libnghttp2 Per https://github.com/JuliaLang/julia/pull/37618/files#diff-2592b7284deb7b3ee2572fbb4f110a2d868137ba3970d01a7ea3c7d07b808642, Julia 1.6 supports the use of the system `libnghttp2` while `make`-ing. --- recipe/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/build.sh b/recipe/build.sh index dc6f2a45..6e4ccc3b 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -46,6 +46,7 @@ make -j 4 prefix=${PREFIX} MARCH=core2 sysconfigdir=${PREFIX}/etc NO_GIT=1 \ USE_SYSTEM_PATCHELF=1 \ USE_SYSTEM_PCRE=1 \ USE_SYSTEM_SUITESPARSE=1 \ + USE_SYSTEM_NGHTTP2=1 \ ${EXTRA_MAKEFLAGS} \ TAGGED_RELEASE_BANNER="conda-forge-julia release" \ CC=$CC CXX=$CXX FC=$FC \ From 72c7c39bad273d910e86f06926c0c7caa2fd658b Mon Sep 17 00:00:00 2001 From: John Muchovej <5000729+jmuchovej@users.noreply.github.com> Date: Mon, 14 Jun 2021 19:11:10 -0400 Subject: [PATCH 06/34] Remove make `cleanall` and `USE_SYSTEM_HTTP2` --- recipe/build.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 6e4ccc3b..e83f8379 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -28,7 +28,6 @@ then export EXTRA_MAKEFLAGS="USE_SYSTEM_LIBUNWIND=0" fi -make cleanall # attempted resolution of build error on PCRE from Azure make -j 4 prefix=${PREFIX} MARCH=core2 sysconfigdir=${PREFIX}/etc NO_GIT=1 \ LIBBLAS=-lblas LIBBLASNAME=libblas LIBLAPACK=-llapack LIBLAPACKNAME=liblapack \ USE_SYSTEM_ARPACK=1 \ @@ -46,7 +45,6 @@ make -j 4 prefix=${PREFIX} MARCH=core2 sysconfigdir=${PREFIX}/etc NO_GIT=1 \ USE_SYSTEM_PATCHELF=1 \ USE_SYSTEM_PCRE=1 \ USE_SYSTEM_SUITESPARSE=1 \ - USE_SYSTEM_NGHTTP2=1 \ ${EXTRA_MAKEFLAGS} \ TAGGED_RELEASE_BANNER="conda-forge-julia release" \ CC=$CC CXX=$CXX FC=$FC \ From ac7a0391c5d0fca907a54a6205363a6930bb1563 Mon Sep 17 00:00:00 2001 From: Simeon Schaub Date: Mon, 19 Jul 2021 16:32:37 +0200 Subject: [PATCH 07/34] use libgit, libssh and libcurl shipped by Julia Also removes some likely to be outdated dependencies. This is based on #111 and likely to still fail, but I could not find the logs for that PR anymore. Also, would it be possible to run the entire testsuite (should take ~1h with multiple threads), since that is also likely to catch any issues with third-party dependencies? --- recipe/build.sh | 7 +++---- recipe/meta.yaml | 6 +----- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index e83f8379..cb60b928 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -32,12 +32,11 @@ make -j 4 prefix=${PREFIX} MARCH=core2 sysconfigdir=${PREFIX}/etc NO_GIT=1 \ LIBBLAS=-lblas LIBBLASNAME=libblas LIBLAPACK=-llapack LIBLAPACKNAME=liblapack \ USE_SYSTEM_ARPACK=1 \ USE_SYSTEM_BLAS=1 \ - USE_SYSTEM_CURL=1 \ - USE_SYSTEM_FFTW=1 \ + USE_SYSTEM_CURL=0 \ USE_SYSTEM_GMP=1 \ USE_SYSTEM_LAPACK=1 \ - USE_SYSTEM_LIBGIT2=1 \ - USE_SYSTEM_LIBSSH2=1 \ + USE_SYSTEM_LIBGIT2=0 \ + USE_SYSTEM_LIBSSH2=0 \ USE_SYSTEM_LLVM=0 \ USE_SYSTEM_MPFR=1 \ USE_SYSTEM_OPENLIBM=1 \ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 874af292..6c940d4a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,9 +18,8 @@ build: requirements: build: - - cmake-binary - perl - - python 2.7.* + - python 3.* - {{ compiler('fortran') }} - {{ compiler('c') }} - {{ compiler('cxx') }} @@ -32,7 +31,6 @@ requirements: - zlib - openlibm 0.5.4 - openspecfun 0.5.3 - - fftw - gmp - mpfr - curl @@ -46,14 +44,12 @@ requirements: - zlib - {{ pin_compatible("libgit2", max_pin="x.x") }} - libosxunwind # [osx] - - fftw - gmp - mpfr - openlibm 0.5.4 - openspecfun 0.5.3 - arpack - suitesparse - - curl - pcre2 10.36 test: From 0c3be4f22b76861ee7f8cf6d2d267f02185ffa7b Mon Sep 17 00:00:00 2001 From: Simeon Schaub Date: Mon, 19 Jul 2021 17:17:59 +0200 Subject: [PATCH 08/34] remove NO_GIT, use OpenBLAS, fix unnecessary deps --- recipe/build.sh | 10 +++------- recipe/meta.yaml | 9 ++------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index cb60b928..575a6fb4 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -12,10 +12,7 @@ html : mkdir -p _build/html EOF -# Julia sets this to unix makefiles later on in its build process -export CMAKE_GENERATOR="make" - -NO_GIT=1 make -C base version_git.jl.phony CC=$CC CXX=$CXX FC=$FC +make -C base version_git.jl.phony CC=$CC CXX=$CXX FC=$FC export EXTRA_MAKEFLAGS="" if [ "$(uname)" == "Darwin" ] @@ -28,8 +25,8 @@ then export EXTRA_MAKEFLAGS="USE_SYSTEM_LIBUNWIND=0" fi -make -j 4 prefix=${PREFIX} MARCH=core2 sysconfigdir=${PREFIX}/etc NO_GIT=1 \ - LIBBLAS=-lblas LIBBLASNAME=libblas LIBLAPACK=-llapack LIBLAPACKNAME=liblapack \ +make -j 4 prefix=${PREFIX} MARCH=core2 sysconfigdir=${PREFIX}/etc \ + LIBBLAS=-lopenblas LIBBLASNAME=libopenblas LIBLAPACK=-llapack LIBLAPACKNAME=liblapack \ USE_SYSTEM_ARPACK=1 \ USE_SYSTEM_BLAS=1 \ USE_SYSTEM_CURL=0 \ @@ -40,7 +37,6 @@ make -j 4 prefix=${PREFIX} MARCH=core2 sysconfigdir=${PREFIX}/etc NO_GIT=1 \ USE_SYSTEM_LLVM=0 \ USE_SYSTEM_MPFR=1 \ USE_SYSTEM_OPENLIBM=1 \ - USE_SYSTEM_OPENSPECFUN=1 \ USE_SYSTEM_PATCHELF=1 \ USE_SYSTEM_PCRE=1 \ USE_SYSTEM_SUITESPARSE=1 \ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6c940d4a..bddbfa2a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -24,13 +24,10 @@ requirements: - {{ compiler('c') }} - {{ compiler('cxx') }} host: - - libblas - - libcblas + - libopenblas - liblapack - patchelf # [linux] - - zlib - openlibm 0.5.4 - - openspecfun 0.5.3 - gmp - mpfr - curl @@ -41,13 +38,11 @@ requirements: - pcre2 10.36 run: - - zlib - - {{ pin_compatible("libgit2", max_pin="x.x") }} + - libopenblas - libosxunwind # [osx] - gmp - mpfr - openlibm 0.5.4 - - openspecfun 0.5.3 - arpack - suitesparse - pcre2 10.36 From 0a690da5a8bbe4e1d4598dc3ac1cebc736122a6b Mon Sep 17 00:00:00 2001 From: Simeon Schaub Date: Mon, 19 Jul 2021 17:31:24 +0200 Subject: [PATCH 09/34] use git repo instead of tarball --- recipe/meta.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bddbfa2a..96a3c153 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,15 +1,13 @@ {% set name = "julia" %} {% set version = "1.6.1" %} -{% set sha256 = "2efc3f3485b837d2d77ed684ef883c55c66cb02edbaab7ffd120375cb86317da" %} package: name: {{ name|lower }} version: {{ version }} source: - fn: v{{ version }}.tar.gz - url: https://github.com/JuliaLang/julia/archive/v{{ version }}.tar.gz - sha256: {{ sha256 }} + git_url: https://github.com/JuliaLang/julia.git + git_tag: v{{ version }} build: skip: True # [win] From d539a9f55e6e9b9de35b2a3afbb1eb0a2d981ade Mon Sep 17 00:00:00 2001 From: Simeon Schaub Date: Mon, 19 Jul 2021 17:44:19 +0200 Subject: [PATCH 10/34] add back CMAKE_GENERATOR variable --- recipe/build.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipe/build.sh b/recipe/build.sh index 575a6fb4..d33469fc 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -12,6 +12,10 @@ html : mkdir -p _build/html EOF + +# Julia sets this to unix makefiles later on in its build process +export CMAKE_GENERATOR="make" + make -C base version_git.jl.phony CC=$CC CXX=$CXX FC=$FC export EXTRA_MAKEFLAGS="" From 2b2f7b61f4b6045693bab443eca97a389211419f Mon Sep 17 00:00:00 2001 From: Mark Kittisopikul Date: Tue, 27 Jul 2021 02:10:27 -0400 Subject: [PATCH 11/34] Use openblas rather than libopenblas Julia needs libopenblas64_.so but this is provided by openblas rather than libopenblas. --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 96a3c153..1a71b312 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -22,7 +22,7 @@ requirements: - {{ compiler('c') }} - {{ compiler('cxx') }} host: - - libopenblas + - openblas - liblapack - patchelf # [linux] - openlibm 0.5.4 @@ -36,7 +36,7 @@ requirements: - pcre2 10.36 run: - - libopenblas + - openblas - libosxunwind # [osx] - gmp - mpfr From 93cdbc57511e0a7baf0d34122abda319f38a04b9 Mon Sep 17 00:00:00 2001 From: Mark Kittisopikul Date: Tue, 27 Jul 2021 04:09:13 -0400 Subject: [PATCH 12/34] Use openblas-ilp64 --- recipe/build.sh | 3 ++- recipe/meta.yaml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index d33469fc..5f7ce15a 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -30,9 +30,10 @@ then fi make -j 4 prefix=${PREFIX} MARCH=core2 sysconfigdir=${PREFIX}/etc \ - LIBBLAS=-lopenblas LIBBLASNAME=libopenblas LIBLAPACK=-llapack LIBLAPACKNAME=liblapack \ + LIBBLAS=-lopenblas64_ LIBBLASNAME=libopenblas64_ LIBLAPACK=-llapack LIBLAPACKNAME=liblapack \ USE_SYSTEM_ARPACK=1 \ USE_SYSTEM_BLAS=1 \ + USE_BLAS64=1 \ USE_SYSTEM_CURL=0 \ USE_SYSTEM_GMP=1 \ USE_SYSTEM_LAPACK=1 \ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1a71b312..70e2248c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -22,7 +22,7 @@ requirements: - {{ compiler('c') }} - {{ compiler('cxx') }} host: - - openblas + - openblas-ilp64 - liblapack - patchelf # [linux] - openlibm 0.5.4 @@ -36,7 +36,7 @@ requirements: - pcre2 10.36 run: - - openblas + - openblas-ilp64 - libosxunwind # [osx] - gmp - mpfr From bdddcc3a3aad679342b5b07d6b6b8fa0be886f1c Mon Sep 17 00:00:00 2001 From: Mark Kittisopikul Date: Tue, 27 Jul 2021 05:09:35 -0400 Subject: [PATCH 13/34] Use libopenblas64_.so for lapack --- recipe/build.sh | 2 +- recipe/meta.yaml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 5f7ce15a..27c63cd3 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -30,7 +30,7 @@ then fi make -j 4 prefix=${PREFIX} MARCH=core2 sysconfigdir=${PREFIX}/etc \ - LIBBLAS=-lopenblas64_ LIBBLASNAME=libopenblas64_ LIBLAPACK=-llapack LIBLAPACKNAME=liblapack \ + LIBBLAS=-lopenblas64_ LIBBLASNAME=libopenblas64_ LIBLAPACK=-lopenblas64_ LIBLAPACKNAME=libopenblas64_ \ USE_SYSTEM_ARPACK=1 \ USE_SYSTEM_BLAS=1 \ USE_BLAS64=1 \ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 70e2248c..4eb2ef4c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,13 +23,12 @@ requirements: - {{ compiler('cxx') }} host: - openblas-ilp64 - - liblapack - patchelf # [linux] - openlibm 0.5.4 - gmp - mpfr - curl - - libgit2 0.27 + - libgit2 - libosxunwind # [osx] - arpack - suitesparse @@ -44,6 +43,8 @@ requirements: - arpack - suitesparse - pcre2 10.36 + - curl + - libgit2 test: commands: From 880984f91650523c3b7ab445b81a48633acd4f24 Mon Sep 17 00:00:00 2001 From: Mark Kittisopikul Date: Tue, 27 Jul 2021 14:37:02 -0400 Subject: [PATCH 14/34] Add git requirement for buliding and running --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4eb2ef4c..e5a5a92a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -33,6 +33,7 @@ requirements: - arpack - suitesparse - pcre2 10.36 + - git run: - openblas-ilp64 @@ -45,6 +46,7 @@ requirements: - pcre2 10.36 - curl - libgit2 + - git test: commands: From 70be393a79733f82cec1968f024a920402842987 Mon Sep 17 00:00:00 2001 From: Mark Kittisopikul Date: Tue, 27 Jul 2021 19:49:04 -0400 Subject: [PATCH 15/34] Only test core for the moment --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e5a5a92a..065f55ad 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -50,7 +50,7 @@ requirements: test: commands: - - julia -e 'Base.runtests("LibGit2/online Pkg/pkg")' + - julia -e 'Base.runtests(["core"])' requires: - perl From c28b47f8e2ed9e7cff429d903a3d7e95acd0b278 Mon Sep 17 00:00:00 2001 From: Mark Kittisopikul Date: Thu, 29 Jul 2021 01:12:39 -0400 Subject: [PATCH 16/34] Use system curl --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 27c63cd3..bf7aa17b 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -34,7 +34,7 @@ make -j 4 prefix=${PREFIX} MARCH=core2 sysconfigdir=${PREFIX}/etc \ USE_SYSTEM_ARPACK=1 \ USE_SYSTEM_BLAS=1 \ USE_BLAS64=1 \ - USE_SYSTEM_CURL=0 \ + USE_SYSTEM_CURL=1 \ USE_SYSTEM_GMP=1 \ USE_SYSTEM_LAPACK=1 \ USE_SYSTEM_LIBGIT2=0 \ From 3af4f7bd51bfedddc1a2f6a1512798e1361f342d Mon Sep 17 00:00:00 2001 From: Mark Kittisopikul Date: Fri, 30 Jul 2021 04:58:49 -0400 Subject: [PATCH 17/34] Test downloads --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 065f55ad..3612742a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -50,7 +50,7 @@ requirements: test: commands: - - julia -e 'Base.runtests(["core"])' + - julia -e 'Base.runtests(["core","Downloads"])' requires: - perl From d7a5ff74c1269c866ba4be97f70b25efd81d06ac Mon Sep 17 00:00:00 2001 From: Mark Kittisopikul Date: Tue, 3 Aug 2021 14:18:50 -0400 Subject: [PATCH 18/34] Unpin versions for dependencies --- recipe/meta.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3612742a..e3531c82 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,14 +17,14 @@ build: requirements: build: - perl - - python 3.* + - python 3 - {{ compiler('fortran') }} - {{ compiler('c') }} - {{ compiler('cxx') }} host: - openblas-ilp64 - patchelf # [linux] - - openlibm 0.5.4 + - openlibm - gmp - mpfr - curl @@ -32,7 +32,7 @@ requirements: - libosxunwind # [osx] - arpack - suitesparse - - pcre2 10.36 + - pcre2 - git run: @@ -40,17 +40,17 @@ requirements: - libosxunwind # [osx] - gmp - mpfr - - openlibm 0.5.4 + - openlibm - arpack - suitesparse - - pcre2 10.36 + - pcre2 - curl - libgit2 - git test: commands: - - julia -e 'Base.runtests(["core","Downloads"])' + - julia -e 'Base.runtests(["core", "regex", "Downloads"])' requires: - perl From 41053fac6df21ff349a575a901ddf6ede1ce3511 Mon Sep 17 00:00:00 2001 From: Mark Kittisopikul Date: Tue, 3 Aug 2021 14:45:15 -0400 Subject: [PATCH 19/34] USE_SYSTEM_LIBSSH2=1 --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index bf7aa17b..46cc4cce 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -38,7 +38,7 @@ make -j 4 prefix=${PREFIX} MARCH=core2 sysconfigdir=${PREFIX}/etc \ USE_SYSTEM_GMP=1 \ USE_SYSTEM_LAPACK=1 \ USE_SYSTEM_LIBGIT2=0 \ - USE_SYSTEM_LIBSSH2=0 \ + USE_SYSTEM_LIBSSH2=1 \ USE_SYSTEM_LLVM=0 \ USE_SYSTEM_MPFR=1 \ USE_SYSTEM_OPENLIBM=1 \ From 5b4e05ece303c01df47b6abf86206902840d8187 Mon Sep 17 00:00:00 2001 From: Mark Kittisopikul Date: Tue, 3 Aug 2021 15:43:43 -0400 Subject: [PATCH 20/34] USE_SYSTEM_LIBGIT2=1 --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 46cc4cce..da98425d 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -37,7 +37,7 @@ make -j 4 prefix=${PREFIX} MARCH=core2 sysconfigdir=${PREFIX}/etc \ USE_SYSTEM_CURL=1 \ USE_SYSTEM_GMP=1 \ USE_SYSTEM_LAPACK=1 \ - USE_SYSTEM_LIBGIT2=0 \ + USE_SYSTEM_LIBGIT2=1 \ USE_SYSTEM_LIBSSH2=1 \ USE_SYSTEM_LLVM=0 \ USE_SYSTEM_MPFR=1 \ From 495c106cb3c2d24432c6105e0f2c1df1fd4923dd Mon Sep 17 00:00:00 2001 From: Mark Kittisopikul Date: Thu, 5 Aug 2021 01:44:41 -0400 Subject: [PATCH 21/34] Revert "USE_SYSTEM_LIBGIT2=1" due to failure on macOS This reverts commit 5b4e05ece303c01df47b6abf86206902840d8187. --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index da98425d..46cc4cce 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -37,7 +37,7 @@ make -j 4 prefix=${PREFIX} MARCH=core2 sysconfigdir=${PREFIX}/etc \ USE_SYSTEM_CURL=1 \ USE_SYSTEM_GMP=1 \ USE_SYSTEM_LAPACK=1 \ - USE_SYSTEM_LIBGIT2=1 \ + USE_SYSTEM_LIBGIT2=0 \ USE_SYSTEM_LIBSSH2=1 \ USE_SYSTEM_LLVM=0 \ USE_SYSTEM_MPFR=1 \ From 0aa0bae2fe3342ce86bca150c13d25880f1c48c9 Mon Sep 17 00:00:00 2001 From: Mark Kittisopikul Date: Thu, 5 Aug 2021 02:36:06 -0400 Subject: [PATCH 22/34] Try with julia-1.6.1-full.tar.gz tarball --- recipe/meta.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e3531c82..09976587 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,13 +1,15 @@ {% set name = "julia" %} {% set version = "1.6.1" %} +{% set sha256 = "71d8e40611361370654e8934c407b2dec04944cf3917c5ecb6482d6b85ed767f" %} package: name: {{ name|lower }} version: {{ version }} source: - git_url: https://github.com/JuliaLang/julia.git - git_tag: v{{ version }} + fn: julia-{{ version }}-full.tar.gz + url: https://github.com/JuliaLang/julia/releases/download/v{{ version }}/julia-{{ version }}-full.tar.gz + sha256: {{ sha256 }} build: skip: True # [win] From 38e95764a5517325e8db24b8249793a8031a9002 Mon Sep 17 00:00:00 2001 From: Mark Kittisopikul Date: Thu, 5 Aug 2021 03:33:00 -0400 Subject: [PATCH 23/34] Add libssh2 as a dependency --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 09976587..4434dc87 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -31,6 +31,7 @@ requirements: - mpfr - curl - libgit2 + - libssh2 - libosxunwind # [osx] - arpack - suitesparse @@ -48,6 +49,7 @@ requirements: - pcre2 - curl - libgit2 + - libssh2 - git test: From 1aca9e24537b40c572d249f0eb19ebd55145e9b9 Mon Sep 17 00:00:00 2001 From: Mark Kittisopikul Date: Thu, 5 Aug 2021 03:33:23 -0400 Subject: [PATCH 24/34] Add other Make.inc flags --- recipe/build.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 46cc4cce..2235900e 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -21,12 +21,8 @@ make -C base version_git.jl.phony CC=$CC CXX=$CXX FC=$FC export EXTRA_MAKEFLAGS="" if [ "$(uname)" == "Darwin" ] then - export EXTRA_MAKEFLAGS="USE_SYSTEM_LIBUNWIND=1" elif [ "$(uname)" == "Linux" ] then - # On linux the released version of libunwind has issues building julia - # See: https://github.com/JuliaLang/julia/issues/23615 - export EXTRA_MAKEFLAGS="USE_SYSTEM_LIBUNWIND=0" fi make -j 4 prefix=${PREFIX} MARCH=core2 sysconfigdir=${PREFIX}/etc \ @@ -45,6 +41,14 @@ make -j 4 prefix=${PREFIX} MARCH=core2 sysconfigdir=${PREFIX}/etc \ USE_SYSTEM_PATCHELF=1 \ USE_SYSTEM_PCRE=1 \ USE_SYSTEM_SUITESPARSE=1 \ + USE_SYSTEM_CSL=0 \ + USE_SYSTEM_LIBUNWIND=1 \ + USE_SYSTEM_LIBUV=0 \ + USE_SYSTEM_UTF8PROC=0 \ + USE_SYSTEM_MBEDTLS=0 \ + USE_SYSTEM_NGHTTP2=0 \ + USE_SYSTEM_ZLIB=0 \ + USE_SYSTEM_P7ZIP=0 \ ${EXTRA_MAKEFLAGS} \ TAGGED_RELEASE_BANNER="conda-forge-julia release" \ CC=$CC CXX=$CXX FC=$FC \ From 52739773cb5cff6bc847d63569cd60dd53902622 Mon Sep 17 00:00:00 2001 From: Mark Kittisopikul Date: Thu, 5 Aug 2021 03:47:10 -0400 Subject: [PATCH 25/34] Make USE_SYSTEM_LIBGIT2 OS dependent --- recipe/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 2235900e..75f9132d 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -20,8 +20,10 @@ make -C base version_git.jl.phony CC=$CC CXX=$CXX FC=$FC export EXTRA_MAKEFLAGS="" if [ "$(uname)" == "Darwin" ] + export EXTRA_MAKE_FLAGS = "USE_SYSTEM_LIBGIT2=0" then elif [ "$(uname)" == "Linux" ] + export EXTRA_MAKE_FLAGS = "USE_SYSTEM_LIBGIT2=1" then fi @@ -33,7 +35,6 @@ make -j 4 prefix=${PREFIX} MARCH=core2 sysconfigdir=${PREFIX}/etc \ USE_SYSTEM_CURL=1 \ USE_SYSTEM_GMP=1 \ USE_SYSTEM_LAPACK=1 \ - USE_SYSTEM_LIBGIT2=0 \ USE_SYSTEM_LIBSSH2=1 \ USE_SYSTEM_LLVM=0 \ USE_SYSTEM_MPFR=1 \ From 620aa6aa4ad6803649a0617bae2decf996d0eadb Mon Sep 17 00:00:00 2001 From: Mark Kittisopikul Date: Thu, 5 Aug 2021 03:56:35 -0400 Subject: [PATCH 26/34] Fix bash typos --- recipe/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 75f9132d..6e04897f 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -20,11 +20,11 @@ make -C base version_git.jl.phony CC=$CC CXX=$CXX FC=$FC export EXTRA_MAKEFLAGS="" if [ "$(uname)" == "Darwin" ] - export EXTRA_MAKE_FLAGS = "USE_SYSTEM_LIBGIT2=0" then + export EXTRA_MAKEFLAGS="USE_SYSTEM_LIBGIT2=0" elif [ "$(uname)" == "Linux" ] - export EXTRA_MAKE_FLAGS = "USE_SYSTEM_LIBGIT2=1" then + export EXTRA_MAKEFLAGS="USE_SYSTEM_LIBGIT2=1" fi make -j 4 prefix=${PREFIX} MARCH=core2 sysconfigdir=${PREFIX}/etc \ From 89bb2fbb87a21434ff3d8e808ca594b1816ca30b Mon Sep 17 00:00:00 2001 From: Mark Kittisopikul Date: Thu, 5 Aug 2021 04:12:39 -0400 Subject: [PATCH 27/34] Add libunwind (nongnu) as a dependency --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4434dc87..b3fb61d1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -33,6 +33,7 @@ requirements: - libgit2 - libssh2 - libosxunwind # [osx] + - libunwind # [linux] - arpack - suitesparse - pcre2 @@ -41,6 +42,7 @@ requirements: run: - openblas-ilp64 - libosxunwind # [osx] + - libunwind # [linux] - gmp - mpfr - openlibm From a24b78803ce3a168856c9c8ddd2e9aa80779a936 Mon Sep 17 00:00:00 2001 From: Mark Kittisopikul Date: Thu, 5 Aug 2021 04:14:53 -0400 Subject: [PATCH 28/34] Clean lint --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b3fb61d1..68099196 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -33,7 +33,7 @@ requirements: - libgit2 - libssh2 - libosxunwind # [osx] - - libunwind # [linux] + - libunwind # [linux] - arpack - suitesparse - pcre2 @@ -42,7 +42,7 @@ requirements: run: - openblas-ilp64 - libosxunwind # [osx] - - libunwind # [linux] + - libunwind # [linux] - gmp - mpfr - openlibm From a296475767af74cf51e8fea7c0a988abee794bd6 Mon Sep 17 00:00:00 2001 From: Mark Kittisopikul Date: Thu, 5 Aug 2021 04:56:37 -0400 Subject: [PATCH 29/34] Use system utf8proc, libnghttp2, zlib, p7zip --- recipe/build.sh | 8 ++++---- recipe/meta.yaml | 8 ++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 6e04897f..c70dedfc 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -45,11 +45,11 @@ make -j 4 prefix=${PREFIX} MARCH=core2 sysconfigdir=${PREFIX}/etc \ USE_SYSTEM_CSL=0 \ USE_SYSTEM_LIBUNWIND=1 \ USE_SYSTEM_LIBUV=0 \ - USE_SYSTEM_UTF8PROC=0 \ + USE_SYSTEM_UTF8PROC=1 \ USE_SYSTEM_MBEDTLS=0 \ - USE_SYSTEM_NGHTTP2=0 \ - USE_SYSTEM_ZLIB=0 \ - USE_SYSTEM_P7ZIP=0 \ + USE_SYSTEM_NGHTTP2=1 \ + USE_SYSTEM_ZLIB=1 \ + USE_SYSTEM_P7ZIP=1 \ ${EXTRA_MAKEFLAGS} \ TAGGED_RELEASE_BANNER="conda-forge-julia release" \ CC=$CC CXX=$CXX FC=$FC \ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 68099196..3fc0e9b6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -38,6 +38,10 @@ requirements: - suitesparse - pcre2 - git + - utf8proc + - libnghttp2 + - zlib + - p7zip run: - openblas-ilp64 @@ -53,6 +57,10 @@ requirements: - libgit2 - libssh2 - git + - utf8proc + - libnghttp2 + - zlib + - p7zip test: commands: From 673495026d239b2751944a9f0d4ef0f9aa8bd047 Mon Sep 17 00:00:00 2001 From: Mark Kittisopikul Date: Thu, 5 Aug 2021 05:51:58 -0400 Subject: [PATCH 30/34] Set requirement as libutf8proc rather than just utf8proc --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3fc0e9b6..26c6793a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -38,7 +38,7 @@ requirements: - suitesparse - pcre2 - git - - utf8proc + - libutf8proc - libnghttp2 - zlib - p7zip @@ -57,7 +57,7 @@ requirements: - libgit2 - libssh2 - git - - utf8proc + - libutf8proc - libnghttp2 - zlib - p7zip From 3c989532eae50838977e6ebfe16632fe597b48f4 Mon Sep 17 00:00:00 2001 From: Mark Kittisopikul Date: Thu, 5 Aug 2021 06:02:04 -0400 Subject: [PATCH 31/34] USE_SYSTEM_UTF8PROC=0, remove libutf8proc --- recipe/build.sh | 2 +- recipe/meta.yaml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index c70dedfc..9fb49786 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -45,7 +45,7 @@ make -j 4 prefix=${PREFIX} MARCH=core2 sysconfigdir=${PREFIX}/etc \ USE_SYSTEM_CSL=0 \ USE_SYSTEM_LIBUNWIND=1 \ USE_SYSTEM_LIBUV=0 \ - USE_SYSTEM_UTF8PROC=1 \ + USE_SYSTEM_UTF8PROC=0 \ USE_SYSTEM_MBEDTLS=0 \ USE_SYSTEM_NGHTTP2=1 \ USE_SYSTEM_ZLIB=1 \ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 26c6793a..9a4d8a90 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -38,7 +38,6 @@ requirements: - suitesparse - pcre2 - git - - libutf8proc - libnghttp2 - zlib - p7zip @@ -57,7 +56,6 @@ requirements: - libgit2 - libssh2 - git - - libutf8proc - libnghttp2 - zlib - p7zip From 0dfa35b32d26d67a2dc85090f716ebe8d4af2398 Mon Sep 17 00:00:00 2001 From: conda-forge-linter Date: Thu, 5 Aug 2021 13:30:45 +0000 Subject: [PATCH 32/34] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.11.0, and conda-forge-pinning 2021.08.05.06.02.11 --- .ci_support/linux_64_.yaml | 18 ++++++++---------- .ci_support/migrations/pcre21037.yaml | 7 ------- .ci_support/osx_64_.yaml | 16 ++++++---------- 3 files changed, 14 insertions(+), 27 deletions(-) delete mode 100644 .ci_support/migrations/pcre21037.yaml diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 770460fe..74e6ade4 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -18,22 +18,22 @@ 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: @@ -41,8 +41,6 @@ pin_run_as_build: max_pin: x.x.x curl: max_pin: x - fftw: - max_pin: x gmp: max_pin: x mpfr: diff --git a/.ci_support/migrations/pcre21037.yaml b/.ci_support/migrations/pcre21037.yaml deleted file mode 100644 index 43cf4037..00000000 --- a/.ci_support/migrations/pcre21037.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -migrator_ts: 1622491612.3316026 -pcre2: -- '10.37' diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index c2447382..ae94f808 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -16,24 +16,22 @@ 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: @@ -41,8 +39,6 @@ pin_run_as_build: max_pin: x.x.x curl: max_pin: x - fftw: - max_pin: x gmp: max_pin: x mpfr: From c9bdf28812700b85ebf7f4ec3e4cd221979a582e Mon Sep 17 00:00:00 2001 From: Mark Kittisopikul Date: Thu, 5 Aug 2021 12:42:04 -0400 Subject: [PATCH 33/34] Apply suggestions from code review by @isuruf All suggestions were applied Co-authored-by: Isuru Fernando --- recipe/build.sh | 1 + recipe/meta.yaml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 9fb49786..280f469e 100644 --- a/recipe/build.sh +++ b/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 \ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9a4d8a90..083ee82a 100644 --- a/recipe/meta.yaml +++ b/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 From 2da0e1050f94937933e2a7862d241beccfc18a39 Mon Sep 17 00:00:00 2001 From: Mark Kittisopikul Date: Thu, 5 Aug 2021 15:05:21 -0400 Subject: [PATCH 34/34] azure: store_build_artifacts: True --- conda-forge.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda-forge.yml b/conda-forge.yml index 1c09752d..118bd44b 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1 +1,3 @@ conda_forge_output_validation: true +azure: + store_build_artifacts: True