From 13996744f249ea9ab9163d08d242eb9e818d926f Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 28 Sep 2023 12:40:56 +1100 Subject: [PATCH 1/2] use more standard form of meson release flag --- recipe/activate-gcc.sh | 2 +- recipe/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/activate-gcc.sh b/recipe/activate-gcc.sh index 46fb7689..8389761f 100644 --- a/recipe/activate-gcc.sh +++ b/recipe/activate-gcc.sh @@ -142,7 +142,7 @@ _CMAKE_ARGS="${_CMAKE_ARGS} -DCMAKE_RANLIB=${CONDA_PREFIX}/bin/@CHOST@-ranlib -D _CMAKE_ARGS="${_CMAKE_ARGS} -DCMAKE_LINKER=${CONDA_PREFIX}/bin/@CHOST@-ld -DCMAKE_STRIP=${CONDA_PREFIX}/bin/@CHOST@-strip" _CMAKE_ARGS="${_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=Release" -_MESON_ARGS="--buildtype release" +_MESON_ARGS="-Dbuildtype=release" if [ "${CONDA_BUILD:-0}" = "1" ]; then _CMAKE_ARGS="${_CMAKE_ARGS} -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY" diff --git a/recipe/meta.yaml b/recipe/meta.yaml index caa1c0e3..3bde3958 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set build_num = 2 %} +{% set build_num = 3 %} {% set gcc_major = 13 if ctng_gcc is undefined else ctng_gcc.split(".")[0] %} # generally, the runtime version of libstdcxx needs to be at least as high # as the compiler; however, wherever libstdcxx changes the default ABI version From 7f0379fceea0bfa8c32301b8dffe2bb3fc74e8e6 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 28 Sep 2023 12:48:27 +1100 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.26.3, and conda-forge-pinning 2023.09.27.16.11.26 --- .scripts/build_steps.sh | 9 ++++----- .scripts/logging_utils.sh | 4 ++-- README.md | 40 +++++++++++++++++++-------------------- 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 595f8b5e..438ed2b9 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,11 +31,10 @@ pkgs_dirs: CONDARC - -mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 +mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=3 +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh index 57bc95c2..aff009f0 100644 --- a/.scripts/logging_utils.sh +++ b/.scripts/logging_utils.sh @@ -12,7 +12,7 @@ function startgroup { echo "##[group]$1";; travis ) echo "$1" - echo -en 'travis_fold:start:'"${1// /}"'\\r';; + echo -en 'travis_fold:start:'"${1// /}"'\r';; github_actions ) echo "::group::$1";; * ) @@ -28,7 +28,7 @@ function endgroup { azure ) echo "##[endgroup]";; travis ) - echo -en 'travis_fold:end:'"${1// /}"'\\r';; + echo -en 'travis_fold:end:'"${1// /}"'\r';; github_actions ) echo "::endgroup::";; esac diff --git a/README.md b/README.md index 3a15c536..fb177eb9 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,8 @@ Package license: BSD-3-Clause Summary: Activation scripts for gcc, g++, gfortran and binutils -About binutils_linux-aarch64 ----------------------------- +About binutils_linux-s390x +-------------------------- Home: https://github.com/conda-forge/ctng-compiler-activation-feedstock @@ -22,8 +22,8 @@ Package license: BSD-3-Clause Summary: The GNU Binutils are a collection of binary tools (activation scripts) -About gcc_bootstrap_linux-aarch64 ---------------------------------- +About gcc_bootstrap_linux-s390x +------------------------------- Home: https://github.com/conda-forge/ctng-compiler-activation-feedstock @@ -31,8 +31,8 @@ Package license: GPL Summary: GCC bootstrap compilers for building deps -About gcc_linux-aarch64 ------------------------ +About gcc_linux-s390x +--------------------- Home: https://github.com/conda-forge/ctng-compiler-activation-feedstock @@ -40,8 +40,8 @@ Package license: BSD-3-Clause Summary: GNU C Compiler (activation scripts) -About gfortran_linux-aarch64 ----------------------------- +About gfortran_linux-s390x +-------------------------- Home: https://github.com/conda-forge/ctng-compiler-activation-feedstock @@ -49,8 +49,8 @@ Package license: BSD-3-Clause Summary: GNU Fortran Compiler (activation scripts) -About gxx_linux-aarch64 ------------------------ +About gxx_linux-s390x +--------------------- Home: https://github.com/conda-forge/ctng-compiler-activation-feedstock @@ -103,8 +103,8 @@ Package license: BSD-3-Clause Summary: GNU C++ Compiler (activation scripts) -About binutils_linux-s390x --------------------------- +About binutils_linux-aarch64 +---------------------------- Home: https://github.com/conda-forge/ctng-compiler-activation-feedstock @@ -112,8 +112,8 @@ Package license: BSD-3-Clause Summary: The GNU Binutils are a collection of binary tools (activation scripts) -About gcc_bootstrap_linux-s390x -------------------------------- +About gcc_bootstrap_linux-aarch64 +--------------------------------- Home: https://github.com/conda-forge/ctng-compiler-activation-feedstock @@ -121,8 +121,8 @@ Package license: GPL Summary: GCC bootstrap compilers for building deps -About gcc_linux-s390x ---------------------- +About gcc_linux-aarch64 +----------------------- Home: https://github.com/conda-forge/ctng-compiler-activation-feedstock @@ -130,8 +130,8 @@ Package license: BSD-3-Clause Summary: GNU C Compiler (activation scripts) -About gfortran_linux-s390x --------------------------- +About gfortran_linux-aarch64 +---------------------------- Home: https://github.com/conda-forge/ctng-compiler-activation-feedstock @@ -139,8 +139,8 @@ Package license: BSD-3-Clause Summary: GNU Fortran Compiler (activation scripts) -About gxx_linux-s390x ---------------------- +About gxx_linux-aarch64 +----------------------- Home: https://github.com/conda-forge/ctng-compiler-activation-feedstock