From 666ea7890fc72be1f107fedd1ff8e872a4221f2d Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 4 Dec 2020 11:42:35 +0000 Subject: [PATCH 001/105] Rebuild for libprotobuf314 --- .ci_support/migrations/libprotobuf314.yaml | 7 +++++++ recipe/meta.yaml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libprotobuf314.yaml diff --git a/.ci_support/migrations/libprotobuf314.yaml b/.ci_support/migrations/libprotobuf314.yaml new file mode 100644 index 0000000..51509d4 --- /dev/null +++ b/.ci_support/migrations/libprotobuf314.yaml @@ -0,0 +1,7 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +libprotobuf: +- '3.14' +migrator_ts: 1607035151.2279923 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d59ef74..39493f0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,7 +15,7 @@ source: - 0003-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch build: - number: 0 + number: 1 skip: true # [win] run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From 8c60f9a9410c6e0892849d8b2d046b9b033a3120 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 4 Dec 2020 11:42:46 +0000 Subject: [PATCH 002/105] MNT: Re-rendered with conda-build 3.20.5, conda-smithy 3.8.5, and conda-forge-pinning 2020.12.04.08.17.45 --- .azure-pipelines/azure-pipelines-linux.yml | 3 +-- .azure-pipelines/azure-pipelines-osx.yml | 1 - .ci_support/linux_64_.yaml | 13 +++++++---- .ci_support/linux_aarch64_.yaml | 11 +++++---- .ci_support/linux_ppc64le_.yaml | 13 +++++++---- .ci_support/migrations/libprotobuf313.yaml | 7 ------ .ci_support/osx_64_.yaml | 9 +++++--- .ci_support/osx_arm64_.yaml | 7 ++++-- .drone.yml | 2 +- .scripts/build_steps.sh | 26 ++++++++++++++++------ .scripts/run_docker_build.sh | 2 ++ .scripts/run_osx_build.sh | 2 +- .travis.yml | 2 +- README.md | 4 +--- build-locally.py | 12 ++++++++++ 15 files changed, 74 insertions(+), 40 deletions(-) delete mode 100644 .ci_support/migrations/libprotobuf313.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 89ab23f..adce9a5 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -11,8 +11,7 @@ jobs: linux_64_: CONFIG: linux_64_ UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - maxParallel: 8 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index e296bdb..39baad3 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -14,7 +14,6 @@ jobs: osx_arm64_: CONFIG: osx_arm64_ UPLOAD_PACKAGES: 'True' - maxParallel: 8 timeoutInMinutes: 360 steps: diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 824ee17..b45de16 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -1,7 +1,9 @@ c_compiler: - gcc c_compiler_version: -- '7' +- '9' +cdt_name: +- cos6 channel_sources: - conda-forge,defaults channel_targets: @@ -9,11 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '7' +- '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-comp7 libprotobuf: -- '3.13' +- '3.14' lz4_c: - 1.9.2 pin_run_as_build: @@ -25,6 +27,9 @@ snappy: - '1' target_platform: - linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index b576328..55b6c61 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '7.5' +- '9' cdt_arch: - aarch64 cdt_name: @@ -15,11 +15,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '7.5' +- '9' docker_image: -- condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-aarch64 libprotobuf: -- '3.13' +- '3.14' lz4_c: - 1.9.2 pin_run_as_build: @@ -31,6 +31,9 @@ snappy: - '1' target_platform: - linux-aarch64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 6f68549..4d7bd87 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -1,7 +1,9 @@ c_compiler: - gcc c_compiler_version: -- '8' +- '9' +cdt_name: +- cos7 channel_sources: - conda-forge,defaults channel_targets: @@ -9,11 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '8' +- '9' docker_image: -- condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-ppc64le libprotobuf: -- '3.13' +- '3.14' lz4_c: - 1.9.2 pin_run_as_build: @@ -25,6 +27,9 @@ snappy: - '1' target_platform: - linux-ppc64le +zip_keys: +- - c_compiler_version + - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/migrations/libprotobuf313.yaml b/.ci_support/migrations/libprotobuf313.yaml deleted file mode 100644 index b9cf28d..0000000 --- a/.ci_support/migrations/libprotobuf313.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libprotobuf: -- '3.13' -migrator_ts: 1597781230.3843527 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index b89097b..7e4dc49 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '10' +- '11' channel_sources: - conda-forge,defaults channel_targets: @@ -11,9 +11,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '10' +- '11' libprotobuf: -- '3.13' +- '3.14' lz4_c: - 1.9.2 macos_machine: @@ -27,6 +27,9 @@ snappy: - '1' target_platform: - osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index bf9cbe9..0029b16 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -5,7 +5,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge/label/llvm_rc,conda-forge,https://conda-web.anaconda.org/conda-forge +- conda-forge/label/rust_dev,conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '11' libprotobuf: -- '3.13' +- '3.14' lz4_c: - 1.9.2 macos_machine: @@ -27,6 +27,9 @@ snappy: - '1' target_platform: - osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.drone.yml b/.drone.yml index d1e62ed..af15091 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,7 +8,7 @@ platform: steps: - name: Install and build - image: condaforge/linux-anvil-aarch64 + image: quay.io/condaforge/linux-anvil-aarch64 environment: CONFIG: linux_aarch64_ UPLOAD_PACKAGES: True diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index ccfbbb6..8a4b0d3 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -19,7 +19,7 @@ conda-build: CONDARC -conda install --yes --quiet conda-forge-ci-setup=3 conda-build pip -c conda-forge +conda install --yes --quiet "conda-forge-ci-setup=3" conda-build pip -c conda-forge # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -33,13 +33,25 @@ if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi -conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ - --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" -validate_recipe_outputs "${FEEDSTOCK_NAME}" -if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then - upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" +if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then + 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" + # Drop into an interactive shell + /bin/bash +else + conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + --suppress-variables ${EXTRA_CB_OPTIONS:-} \ + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + validate_recipe_outputs "${FEEDSTOCK_NAME}" + + if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then + upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" + fi fi touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}" \ No newline at end of file diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index e4d5bab..87ba4db 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -74,6 +74,8 @@ docker run ${DOCKER_RUN_ARGS} \ -e CI \ -e FEEDSTOCK_NAME \ -e CPU_COUNT \ + -e BUILD_WITH_CONDA_DEBUG \ + -e BUILD_OUTPUT_ID \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index d64afd0..3675dac 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,7 +23,7 @@ source ${HOME}/miniforge3/etc/profile.d/conda.sh conda activate base echo -e "\n\nInstalling conda-forge-ci-setup=3 and conda-build." -conda install -n base --quiet --yes conda-forge-ci-setup=3 conda-build pip +conda install -n base --quiet --yes "conda-forge-ci-setup=3" conda-build pip diff --git a/.travis.yml b/.travis.yml index fb662ac..6a7591a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ language: generic matrix: include: - - env: CONFIG=linux_ppc64le_ UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_ UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le diff --git a/README.md b/README.md index 8a0d26a..74ed8da 100644 --- a/README.md +++ b/README.md @@ -5,12 +5,10 @@ Home: http://github.com/apache/orc Package license: Apache-2.0 -Feedstock license: BSD-3-Clause +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/orc-feedstock/blob/master/LICENSE.txt) Summary: C++ libraries for Apache ORC - - Current build status ==================== diff --git a/build-locally.py b/build-locally.py index 8f7ecca..3453cfe 100755 --- a/build-locally.py +++ b/build-locally.py @@ -12,6 +12,10 @@ def setup_environment(ns): os.environ["CONFIG"] = ns.config os.environ["UPLOAD_PACKAGES"] = "False" + if ns.debug: + os.environ["BUILD_WITH_CONDA_DEBUG"] = "1" + if ns.output_id: + os.environ["BUILD_OUTPUT_ID"] = ns.output_id def run_docker_build(ns): @@ -51,6 +55,14 @@ def verify_config(ns): def main(args=None): p = ArgumentParser("build-locally") p.add_argument("config", default=None, nargs="?") + p.add_argument( + "--debug", + action="store_true", + help="Setup debug environment using `conda debug`", + ) + p.add_argument( + "--output-id", help="If running debug, specify the output to setup." + ) ns = p.parse_args(args=args) verify_config(ns) From f1ddf6d4aedb46a6593c2c5d9eb313cb9f698004 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 11 Dec 2020 02:25:04 +0000 Subject: [PATCH 003/105] updated v1.6.6 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 39493f0..886a9c3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.6.5" %} +{% set version = "1.6.6" %} package: name: orc @@ -6,7 +6,7 @@ package: source: url: https://archive.apache.org/dist/orc/orc-{{ version }}/orc-{{ version }}.tar.gz - sha256: 1e77840861a5c5c80173b39a32f4fba97fb3ed9d0cd492d8eae65e53bd496e98 + sha256: 93d2e5f7c9f76ea5cdf29073c73a00a37c54281a5c02bcc6395f1cf521ea246c patches: # ORC builds by default with -Werror but some dependencies omit warnings. # This deactivates -Werror @@ -15,7 +15,7 @@ source: - 0003-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch build: - number: 1 + number: 0 skip: true # [win] run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From a47a78131114b5af05d05cec1994cac2f22073d6 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 31 Dec 2020 21:07:28 +0000 Subject: [PATCH 004/105] Rebuild for lz4-c193 --- .ci_support/migrations/lz4-c193.yaml | 11 +++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/lz4-c193.yaml diff --git a/.ci_support/migrations/lz4-c193.yaml b/.ci_support/migrations/lz4-c193.yaml new file mode 100644 index 0000000..36bea28 --- /dev/null +++ b/.ci_support/migrations/lz4-c193.yaml @@ -0,0 +1,11 @@ +migrator_ts: 1609160909 +__migrator: + kind: + version + migration_number: + 1 + build_number: + 1 + +lz4_c: + - 1.9.3 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 886a9c3..6413ec6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,7 +15,7 @@ source: - 0003-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch build: - number: 0 + number: 1 skip: true # [win] run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From f39da99639685176541a3e2165d65dcf1c2d8fd2 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 31 Dec 2020 21:07:39 +0000 Subject: [PATCH 005/105] MNT: Re-rendered with conda-build 3.20.5, conda-smithy 3.8.6, and conda-forge-pinning 2020.12.31.20.36.09 --- .ci_support/linux_64_.yaml | 2 +- .ci_support/linux_aarch64_.yaml | 2 +- .ci_support/linux_ppc64le_.yaml | 2 +- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .scripts/run_docker_build.sh | 12 ++++++++---- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index b45de16..055592b 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -17,7 +17,7 @@ docker_image: libprotobuf: - '3.14' lz4_c: -- 1.9.2 +- 1.9.3 pin_run_as_build: lz4-c: max_pin: x.x.x diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 55b6c61..d6f9cc7 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -21,7 +21,7 @@ docker_image: libprotobuf: - '3.14' lz4_c: -- 1.9.2 +- 1.9.3 pin_run_as_build: lz4-c: max_pin: x.x.x diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 4d7bd87..6b26846 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -17,7 +17,7 @@ docker_image: libprotobuf: - '3.14' lz4_c: -- 1.9.2 +- 1.9.3 pin_run_as_build: lz4-c: max_pin: x.x.x diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 7e4dc49..96e06ee 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: libprotobuf: - '3.14' lz4_c: -- 1.9.2 +- 1.9.3 macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 0029b16..cea162c 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: libprotobuf: - '3.14' lz4_c: -- 1.9.2 +- 1.9.3 macos_machine: - arm64-apple-darwin20.0.0 pin_run_as_build: diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 87ba4db..36dacd6 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -45,8 +45,12 @@ fi if [ -z "${DOCKER_IMAGE}" ]; then SHYAML_INSTALLED="$(shyaml -h || echo NO)" if [ "${SHYAML_INSTALLED}" == "NO" ]; then - echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Falling back to condaforge/linux-anvil-comp7" - DOCKER_IMAGE="condaforge/linux-anvil-comp7" + 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" + fi else DOCKER_IMAGE="$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 )" fi @@ -64,8 +68,8 @@ fi export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" docker run ${DOCKER_RUN_ARGS} \ - -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z \ - -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z \ + -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z,delegated \ + -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z,delegated \ -e CONFIG \ -e HOST_USER_ID \ -e UPLOAD_PACKAGES \ From 4b9a6d6efb208d525a52fca0b408f2707e6a46be Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 23 Jan 2021 04:26:12 +0000 Subject: [PATCH 006/105] updated v1.6.7 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6413ec6..d9a6fef 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.6.6" %} +{% set version = "1.6.7" %} package: name: orc @@ -6,7 +6,7 @@ package: source: url: https://archive.apache.org/dist/orc/orc-{{ version }}/orc-{{ version }}.tar.gz - sha256: 93d2e5f7c9f76ea5cdf29073c73a00a37c54281a5c02bcc6395f1cf521ea246c + sha256: a015b15ae4586073b00784c469286624986b49824b796ac1bfbd8629bb3b604b patches: # ORC builds by default with -Werror but some dependencies omit warnings. # This deactivates -Werror @@ -15,7 +15,7 @@ source: - 0003-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch build: - number: 1 + number: 0 skip: true # [win] run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From 7ca43e4427662ec56e942855409035c144dfa633 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 23 Jan 2021 04:26:22 +0000 Subject: [PATCH 007/105] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.8.6, and conda-forge-pinning 2021.01.22.19.19.10 --- .ci_support/linux_64_.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 055592b..85a43f1 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -30,6 +30,8 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - cdt_name + - docker_image zlib: - '1.2' zstd: From 4e2300228e573ea731780d93197fa08984ae0ab8 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sun, 21 Feb 2021 01:41:03 +0000 Subject: [PATCH 008/105] Rebuild for libprotobuf315 --- .ci_support/migrations/libprotobuf315.yaml | 7 +++++++ recipe/meta.yaml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libprotobuf315.yaml diff --git a/.ci_support/migrations/libprotobuf315.yaml b/.ci_support/migrations/libprotobuf315.yaml new file mode 100644 index 0000000..daa7bc7 --- /dev/null +++ b/.ci_support/migrations/libprotobuf315.yaml @@ -0,0 +1,7 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +libprotobuf: +- '3.15' +migrator_ts: 1613798277.3441222 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d9a6fef..ebffb91 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,7 +15,7 @@ source: - 0003-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch build: - number: 0 + number: 1 skip: true # [win] run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From 1dca7ea3c9682813418a42393e58893dd911d202 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sun, 21 Feb 2021 01:41:11 +0000 Subject: [PATCH 009/105] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.8.6, and conda-forge-pinning 2021.02.20.20.42.23 --- .ci_support/linux_64_.yaml | 2 +- .ci_support/linux_aarch64_.yaml | 2 +- .ci_support/linux_ppc64le_.yaml | 2 +- .ci_support/migrations/libprotobuf314.yaml | 7 ------- .ci_support/migrations/lz4-c193.yaml | 11 ----------- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- 7 files changed, 5 insertions(+), 23 deletions(-) delete mode 100644 .ci_support/migrations/libprotobuf314.yaml delete mode 100644 .ci_support/migrations/lz4-c193.yaml diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 85a43f1..d0a1ccb 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-comp7 libprotobuf: -- '3.14' +- '3.15' lz4_c: - 1.9.3 pin_run_as_build: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index d6f9cc7..0f065b3 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -19,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-aarch64 libprotobuf: -- '3.14' +- '3.15' lz4_c: - 1.9.3 pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 6b26846..cf3851d 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-ppc64le libprotobuf: -- '3.14' +- '3.15' lz4_c: - 1.9.3 pin_run_as_build: diff --git a/.ci_support/migrations/libprotobuf314.yaml b/.ci_support/migrations/libprotobuf314.yaml deleted file mode 100644 index 51509d4..0000000 --- a/.ci_support/migrations/libprotobuf314.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libprotobuf: -- '3.14' -migrator_ts: 1607035151.2279923 diff --git a/.ci_support/migrations/lz4-c193.yaml b/.ci_support/migrations/lz4-c193.yaml deleted file mode 100644 index 36bea28..0000000 --- a/.ci_support/migrations/lz4-c193.yaml +++ /dev/null @@ -1,11 +0,0 @@ -migrator_ts: 1609160909 -__migrator: - kind: - version - migration_number: - 1 - build_number: - 1 - -lz4_c: - - 1.9.3 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 96e06ee..406392a 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '11' libprotobuf: -- '3.14' +- '3.15' lz4_c: - 1.9.3 macos_machine: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index cea162c..a7bb039 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '11' libprotobuf: -- '3.14' +- '3.15' lz4_c: - 1.9.3 macos_machine: From ae87f49d94e53d5d5f72fed468eb0749ba75f114 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 21 Feb 2021 22:30:23 +0100 Subject: [PATCH 010/105] Cross-compile linux-ppc64le --- conda-forge.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/conda-forge.yml b/conda-forge.yml index cea5359..a7afddf 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,4 +1,6 @@ -build_platform: {osx_arm64: osx_64} +build_platform: + linux_ppc64le: linux_64 + osx_arm64: osx_64 conda_forge_output_validation: true provider: {linux_aarch64: default, linux_ppc64le: default} test_on_native_only: true From 3484e244723161b26723279a5bd33523a45758fd Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 21 Feb 2021 22:31:02 +0100 Subject: [PATCH 011/105] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.8.6, and conda-forge-pinning 2021.02.21.18.29.10 --- .azure-pipelines/azure-pipelines-linux.yml | 4 ++++ .ci_support/linux_ppc64le_.yaml | 2 +- .travis.yml | 20 -------------------- README.md | 7 ------- 4 files changed, 5 insertions(+), 28 deletions(-) delete mode 100644 .travis.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index adce9a5..74a3d33 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -12,6 +12,10 @@ jobs: CONFIG: linux_64_ UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_ppc64le_: + CONFIG: linux_ppc64le_ + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 timeoutInMinutes: 360 steps: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index cf3851d..b7b9fbf 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-comp7 libprotobuf: - '3.15' lz4_c: diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 6a7591a..0000000 --- a/.travis.yml +++ /dev/null @@ -1,20 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. - -language: generic - - - -matrix: - include: - - env: CONFIG=linux_ppc64le_ UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - -script: - - export CI=travis - - export GIT_BRANCH="$TRAVIS_BRANCH" - - export FEEDSTOCK_NAME=$(basename ${TRAVIS_REPO_SLUG}) - - - - if [[ ${PLATFORM} =~ .*linux.* ]]; then ./.scripts/run_docker_build.sh; fi \ No newline at end of file diff --git a/README.md b/README.md index 74ed8da..ed7618f 100644 --- a/README.md +++ b/README.md @@ -14,13 +14,6 @@ Current build status - - -
Travis - - macOS - -
Drone From c021172bbc5846de88b599ead09e53a3e3a47faa Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 7 May 2021 19:49:50 +0000 Subject: [PATCH 012/105] Rebuild for libprotobuf316 --- .ci_support/migrations/libprotobuf316.yaml | 7 +++++++ recipe/meta.yaml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libprotobuf316.yaml diff --git a/.ci_support/migrations/libprotobuf316.yaml b/.ci_support/migrations/libprotobuf316.yaml new file mode 100644 index 0000000..3721186 --- /dev/null +++ b/.ci_support/migrations/libprotobuf316.yaml @@ -0,0 +1,7 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +libprotobuf: +- '3.16' +migrator_ts: 1620379043.9019938 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ebffb91..373666d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,7 +15,7 @@ source: - 0003-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch build: - number: 1 + number: 2 skip: true # [win] run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From 09dbeaa9fa1cf49e68a92521bdac6c99a9ba973a Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 7 May 2021 19:49:59 +0000 Subject: [PATCH 013/105] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.10.1, and conda-forge-pinning 2021.05.07.14.12.29 --- .ci_support/linux_64_.yaml | 2 +- .ci_support/linux_aarch64_.yaml | 2 +- .ci_support/linux_ppc64le_.yaml | 2 +- .ci_support/migrations/libprotobuf315.yaml | 7 --- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .scripts/build_steps.sh | 29 ++++++++-- .scripts/logging_utils.sh | 35 ++++++++++++ .scripts/run_docker_build.sh | 19 +++++-- .scripts/run_osx_build.sh | 66 +++++++++++++--------- LICENSE.txt | 2 +- README.md | 5 +- build-locally.py | 27 ++++++++- 13 files changed, 147 insertions(+), 53 deletions(-) delete mode 100644 .ci_support/migrations/libprotobuf315.yaml create mode 100644 .scripts/logging_utils.sh diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index d0a1ccb..d5d9ec3 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-comp7 libprotobuf: -- '3.15' +- '3.16' lz4_c: - 1.9.3 pin_run_as_build: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 0f065b3..4da7fde 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -19,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-aarch64 libprotobuf: -- '3.15' +- '3.16' lz4_c: - 1.9.3 pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index b7b9fbf..29be8ec 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-comp7 libprotobuf: -- '3.15' +- '3.16' lz4_c: - 1.9.3 pin_run_as_build: diff --git a/.ci_support/migrations/libprotobuf315.yaml b/.ci_support/migrations/libprotobuf315.yaml deleted file mode 100644 index daa7bc7..0000000 --- a/.ci_support/migrations/libprotobuf315.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libprotobuf: -- '3.15' -migrator_ts: 1613798277.3441222 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 406392a..8961c8d 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '11' libprotobuf: -- '3.15' +- '3.16' lz4_c: - 1.9.3 macos_machine: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index a7bb039..18b5a93 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '11' libprotobuf: -- '3.15' +- '3.16' lz4_c: - 1.9.3 macos_machine: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 8a4b0d3..99baf86 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -6,8 +6,15 @@ # benefit from the improvement. set -xeuo pipefail -export PYTHONUNBUFFERED=1 export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}" +source ${FEEDSTOCK_ROOT}/.scripts/logging_utils.sh + + +( endgroup "Start Docker" ) 2> /dev/null + +( startgroup "Configuring conda" ) 2> /dev/null + +export PYTHONUNBUFFERED=1 export RECIPE_ROOT="${RECIPE_ROOT:-/home/conda/recipe_root}" export CI_SUPPORT="${FEEDSTOCK_ROOT}/.ci_support" export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" @@ -18,8 +25,9 @@ conda-build: root-dir: ${FEEDSTOCK_ROOT}/build_artifacts CONDARC +BUILD_CMD=build -conda install --yes --quiet "conda-forge-ci-setup=3" conda-build pip -c conda-forge +conda install --yes --quiet "conda-forge-ci-setup=3" conda-build pip ${GET_BOA:-} -c conda-forge # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -29,11 +37,13 @@ source run_conda_forge_build_setup # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" -if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then +if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${BUILD_WITH_CONDA_DEBUG:-0}" != 1 ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi +( endgroup "Configuring conda" ) 2> /dev/null + if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" @@ -41,17 +51,28 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then conda debug "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + # Drop into an interactive shell /bin/bash else - conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda $BUILD_CMD "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + ( startgroup "Validating outputs" ) 2> /dev/null + validate_recipe_outputs "${FEEDSTOCK_NAME}" + ( endgroup "Validating outputs" ) 2> /dev/null + + ( startgroup "Uploading packages" ) 2> /dev/null + if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" 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 new file mode 100644 index 0000000..57bc95c --- /dev/null +++ b/.scripts/logging_utils.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +# Provide a unified interface for the different logging +# utilities CI providers offer. If unavailable, provide +# a compatible fallback (e.g. bare `echo xxxxxx`). + +function startgroup { + # Start a foldable group of log lines + # Pass a single argument, quoted + case ${CI:-} in + azure ) + echo "##[group]$1";; + 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 36dacd6..244ccd1 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -5,6 +5,10 @@ # changes to this script, consider a proposal to conda-smithy so that other feedstocks can also # benefit from the improvement. +source .scripts/logging_utils.sh + +( startgroup "Configure Docker" ) 2> /dev/null + set -xeo pipefail THISDIR="$( cd "$( dirname "$0" )" >/dev/null && pwd )" @@ -48,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 @@ -66,6 +70,10 @@ if [ -z "${CI}" ]; then DOCKER_RUN_ARGS="-it ${DOCKER_RUN_ARGS}" fi +( 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 \ @@ -88,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 3675dac..708b1e1 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -1,61 +1,73 @@ #!/usr/bin/env bash -set -x +source .scripts/logging_utils.sh + +set -xe + +MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} + +( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null -echo -e "\n\nInstalling a fresh version of Miniforge." -if [[ ${CI} == "travis" ]]; then - echo -en 'travis_fold:start:install_miniforge\\r' -fi 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 -if [[ ${CI} == "travis" ]]; then - echo -en 'travis_fold:end:install_miniforge\\r' -fi +bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} -echo -e "\n\nConfiguring conda." -if [[ ${CI} == "travis" ]]; then - echo -en 'travis_fold:start:configure_conda\\r' -fi +( endgroup "Installing a fresh version of Miniforge" ) 2> /dev/null + +( startgroup "Configuring conda" ) 2> /dev/null -source ${HOME}/miniforge3/etc/profile.d/conda.sh +BUILD_CMD=build + +source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base echo -e "\n\nInstalling conda-forge-ci-setup=3 and conda-build." -conda install -n base --quiet --yes "conda-forge-ci-setup=3" conda-build pip +conda install -n base --quiet --yes "conda-forge-ci-setup=3" conda-build pip ${GET_BOA:-} 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 -if [[ ${CI} == "travis" ]]; then - echo -en 'travis_fold:end:configure_conda\\r' -fi -set -e +( endgroup "Configuring conda" ) 2> /dev/null -echo -e "\n\nMaking the build clobber file and running the build." + +echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi -conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml ${EXTRA_CB_OPTIONS:-} +conda $BUILD_CMD ./recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml ${EXTRA_CB_OPTIONS:-} +( startgroup "Validating outputs" ) 2> /dev/null + validate_recipe_outputs "${FEEDSTOCK_NAME}" +( endgroup "Validating outputs" ) 2> /dev/null + +( startgroup "Uploading packages" ) 2> /dev/null + if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then - echo -e "\n\nUploading the packages." upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml -fi \ No newline at end of file +fi + +( endgroup "Uploading packages" ) 2> /dev/null \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt index 5f30279..ed3f451 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,5 @@ BSD 3-clause license -Copyright (c) 2015-2020, conda-forge contributors +Copyright (c) 2015-2021, conda-forge contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/README.md b/README.md index ed7618f..455f3c5 100644 --- a/README.md +++ b/README.md @@ -90,6 +90,7 @@ Installing `orc` from the `conda-forge` channel can be achieved by adding `conda ``` conda config --add channels conda-forge +conda config --set channel_priority strict ``` Once the `conda-forge` channel has been enabled, `orc` can be installed with: @@ -160,9 +161,9 @@ build distinct package versions. In order to produce a uniquely identifiable distribution: * If the version of a package **is not** being increased, please add or increase - the [``build/number``](https://conda.io/docs/user-guide/tasks/build-packages/define-metadata.html#build-number-and-string). + the [``build/number``](https://docs.conda.io/projects/conda-build/en/latest/resources/define-metadata.html#build-number-and-string). * If the version of a package **is** being increased, please remember to return - the [``build/number``](https://conda.io/docs/user-guide/tasks/build-packages/define-metadata.html#build-number-and-string) + the [``build/number``](https://docs.conda.io/projects/conda-build/en/latest/resources/define-metadata.html#build-number-and-string) back to 0. Feedstock Maintainers diff --git a/build-locally.py b/build-locally.py index 3453cfe..00eeb34 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 bb9bc8641b99ba505adf699a2630348cafe1c727 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sun, 16 May 2021 20:32:08 +0000 Subject: [PATCH 014/105] Rebuild for zstd15 --- .ci_support/migrations/zstd15.yaml | 7 +++++++ recipe/meta.yaml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/zstd15.yaml diff --git a/.ci_support/migrations/zstd15.yaml b/.ci_support/migrations/zstd15.yaml new file mode 100644 index 0000000..3283c46 --- /dev/null +++ b/.ci_support/migrations/zstd15.yaml @@ -0,0 +1,7 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +migrator_ts: 1621034958.4997654 +zstd: +- '1.5' diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 373666d..f77a24c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,7 +15,7 @@ source: - 0003-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch build: - number: 2 + number: 3 skip: true # [win] run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From bdf38c6b5d1d14f1744bf5789ebc42f4f4f5f9f2 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sun, 16 May 2021 20:32:18 +0000 Subject: [PATCH 015/105] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.10.1, and conda-forge-pinning 2021.05.16.17.33.49 --- .ci_support/linux_64_.yaml | 2 +- .ci_support/linux_aarch64_.yaml | 2 +- .ci_support/linux_ppc64le_.yaml | 2 +- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index d5d9ec3..abd1950 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -35,4 +35,4 @@ zip_keys: zlib: - '1.2' zstd: -- '1.4' +- '1.5' diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 4da7fde..22e19b9 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -37,4 +37,4 @@ zip_keys: zlib: - '1.2' zstd: -- '1.4' +- '1.5' diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 29be8ec..2ac4ffd 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -33,4 +33,4 @@ zip_keys: zlib: - '1.2' zstd: -- '1.4' +- '1.5' diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 8961c8d..834cc85 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -33,4 +33,4 @@ zip_keys: zlib: - '1.2' zstd: -- '1.4' +- '1.5' diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 18b5a93..2fa2154 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -33,4 +33,4 @@ zip_keys: zlib: - '1.2' zstd: -- '1.4' +- '1.5' From 4af4e40798eee0d3f3c7898adb591c4205a78644 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sun, 23 May 2021 03:51:15 +0000 Subject: [PATCH 016/105] updated v1.6.8 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f77a24c..26fb2c3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.6.7" %} +{% set version = "1.6.8" %} package: name: orc @@ -6,7 +6,7 @@ package: source: url: https://archive.apache.org/dist/orc/orc-{{ version }}/orc-{{ version }}.tar.gz - sha256: a015b15ae4586073b00784c469286624986b49824b796ac1bfbd8629bb3b604b + sha256: de7d9349543c62be280703543db915de0f8d1467067fa87152112567cc65c380 patches: # ORC builds by default with -Werror but some dependencies omit warnings. # This deactivates -Werror @@ -15,7 +15,7 @@ source: - 0003-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch build: - number: 3 + number: 0 skip: true # [win] run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From a63dab0745d243321bb9126f8fd58ccac9a3beae Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 3 Jul 2021 02:53:51 +0000 Subject: [PATCH 017/105] updated v1.6.9 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 26fb2c3..f87ddaa 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.6.8" %} +{% set version = "1.6.9" %} package: name: orc @@ -6,7 +6,7 @@ package: source: url: https://archive.apache.org/dist/orc/orc-{{ version }}/orc-{{ version }}.tar.gz - sha256: de7d9349543c62be280703543db915de0f8d1467067fa87152112567cc65c380 + sha256: d19af60cd81cdb17872aa99b3687e471683e22c6fae73a21d5fc5aed636ebbb8 patches: # ORC builds by default with -Werror but some dependencies omit warnings. # This deactivates -Werror From 094c833fcdd422f45a685f607de71990c1ef7f18 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 3 Jul 2021 02:54:09 +0000 Subject: [PATCH 018/105] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.10.3, and conda-forge-pinning 2021.07.02.15.37.15 --- .azure-pipelines/azure-pipelines-linux.yml | 2 +- .ci_support/migrations/zstd15.yaml | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 .ci_support/migrations/zstd15.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 74a3d33..91ac554 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -5,7 +5,7 @@ jobs: - job: linux pool: - vmImage: ubuntu-16.04 + vmImage: ubuntu-latest strategy: matrix: linux_64_: diff --git a/.ci_support/migrations/zstd15.yaml b/.ci_support/migrations/zstd15.yaml deleted file mode 100644 index 3283c46..0000000 --- a/.ci_support/migrations/zstd15.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -migrator_ts: 1621034958.4997654 -zstd: -- '1.5' From 234eefb6e4a0f04385e9908c873d68901bcf0a14 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 11 Aug 2021 03:44:17 +0000 Subject: [PATCH 019/105] updated v1.6.10 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f87ddaa..00e2cbf 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.6.9" %} +{% set version = "1.6.10" %} package: name: orc @@ -6,7 +6,7 @@ package: source: url: https://archive.apache.org/dist/orc/orc-{{ version }}/orc-{{ version }}.tar.gz - sha256: d19af60cd81cdb17872aa99b3687e471683e22c6fae73a21d5fc5aed636ebbb8 + sha256: 3a7347c85d18e44dece97d98320313848ec1d60aa635136a5187eafec7632ad2 patches: # ORC builds by default with -Werror but some dependencies omit warnings. # This deactivates -Werror From 5d2f4a09183473fe0b34ee8f7bf58dd9b9e292c6 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 11 Aug 2021 03:44:34 +0000 Subject: [PATCH 020/105] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.11.0, and conda-forge-pinning 2021.08.08.03.57.11 --- .ci_support/migrations/libprotobuf316.yaml | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 .ci_support/migrations/libprotobuf316.yaml diff --git a/.ci_support/migrations/libprotobuf316.yaml b/.ci_support/migrations/libprotobuf316.yaml deleted file mode 100644 index 3721186..0000000 --- a/.ci_support/migrations/libprotobuf316.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libprotobuf: -- '3.16' -migrator_ts: 1620379043.9019938 From 55c4bc226a5b7de57f0482a9fd521f3bf0fcf567 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 17 Sep 2021 09:53:49 +0000 Subject: [PATCH 021/105] Rebuild for libprotobuf318 --- .ci_support/migrations/libprotobuf318.yaml | 7 +++++++ recipe/meta.yaml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libprotobuf318.yaml diff --git a/.ci_support/migrations/libprotobuf318.yaml b/.ci_support/migrations/libprotobuf318.yaml new file mode 100644 index 0000000..328967a --- /dev/null +++ b/.ci_support/migrations/libprotobuf318.yaml @@ -0,0 +1,7 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +libprotobuf: +- '3.18' +migrator_ts: 1631764220.7977521 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 00e2cbf..d81be75 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,7 +15,7 @@ source: - 0003-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch build: - number: 0 + number: 1 skip: true # [win] run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From e41d3de832c969dbfa1d2a49bbdc2e53c93c5c7c Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 17 Sep 2021 09:54:28 +0000 Subject: [PATCH 022/105] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.12, and conda-forge-pinning 2021.09.17.05.51.46 --- .ci_support/linux_64_.yaml | 2 +- .ci_support/linux_aarch64_.yaml | 2 +- .ci_support/linux_ppc64le_.yaml | 2 +- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index abd1950..b5a6aef 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-comp7 libprotobuf: -- '3.16' +- '3.18' lz4_c: - 1.9.3 pin_run_as_build: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 22e19b9..579aa0a 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -19,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-aarch64 libprotobuf: -- '3.16' +- '3.18' lz4_c: - 1.9.3 pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 2ac4ffd..aa16472 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-comp7 libprotobuf: -- '3.16' +- '3.18' lz4_c: - 1.9.3 pin_run_as_build: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 834cc85..a025e81 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '11' libprotobuf: -- '3.16' +- '3.18' lz4_c: - 1.9.3 macos_machine: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 2fa2154..8a7348d 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -5,7 +5,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge/label/rust_dev,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '11' libprotobuf: -- '3.16' +- '3.18' lz4_c: - 1.9.3 macos_machine: From db177f56d36877766e41e85f538c6ab4c1b6b6c3 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Fri, 17 Sep 2021 21:51:10 -0400 Subject: [PATCH 023/105] Bump version to 1.6.11 --- ...vate-aggressive-failures-on-warnings.patch | 10 +++--- ...-cmake-modules-to-accommodate-librar.patch | 34 +++++++++---------- ...to-be-a-static-library-let-end-user-.patch | 8 ++--- recipe/meta.yaml | 6 ++-- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/recipe/0001-Deactivate-aggressive-failures-on-warnings.patch b/recipe/0001-Deactivate-aggressive-failures-on-warnings.patch index 05afbd3..3b3d8d0 100644 --- a/recipe/0001-Deactivate-aggressive-failures-on-warnings.patch +++ b/recipe/0001-Deactivate-aggressive-failures-on-warnings.patch @@ -1,17 +1,17 @@ -From 557f87232046e8e6135e553444a736ff341bef8e Mon Sep 17 00:00:00 2001 +From 0dd2bb84d53c2ec12c0c1d34c574b77584d966da Mon Sep 17 00:00:00 2001 From: "Korn, Uwe" Date: Tue, 19 Mar 2019 11:16:02 +0100 -Subject: [PATCH] Deactivate aggressive failures on warnings +Subject: [PATCH 1/3] Deactivate aggressive failures on warnings --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4484e373..e17405bb 100644 +index 285f3f7b..b0bc4e9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -98,6 +98,8 @@ elseif (MSVC) +@@ -121,6 +121,8 @@ elseif (MSVC) set (WARN_FLAGS "${WARN_FLAGS} -wd4146") # unary minus operator applied to unsigned type, result still unsigned endif () @@ -21,5 +21,5 @@ index 4484e373..e17405bb 100644 INCLUDE(CheckSourceCompiles) -- -2.20.1 +2.31.1 diff --git a/recipe/0002-Partially-rework-cmake-modules-to-accommodate-librar.patch b/recipe/0002-Partially-rework-cmake-modules-to-accommodate-librar.patch index f913614..b2c8f08 100644 --- a/recipe/0002-Partially-rework-cmake-modules-to-accommodate-librar.patch +++ b/recipe/0002-Partially-rework-cmake-modules-to-accommodate-librar.patch @@ -1,7 +1,7 @@ -From 8c6406b01cf0c9e144466651c9fe7d833a2c5ca4 Mon Sep 17 00:00:00 2001 +From c215bd7f01089caea8b6f271034a509cbad85bf7 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sat, 29 Aug 2020 13:37:21 -0400 -Subject: [PATCH 2/2] Partially rework cmake modules to accommodate library +Subject: [PATCH 2/3] Partially rework cmake modules to accommodate library types This patch allows selectively linking each third party library @@ -21,7 +21,7 @@ statically with a fallback to dynamic, if not available 11 files changed, 200 insertions(+), 115 deletions(-) diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt -index 7ff543dd..772f4c66 100644 +index 3d4a1629..38482e93 100644 --- a/c++/src/CMakeLists.txt +++ b/c++/src/CMakeLists.txt @@ -155,7 +155,7 @@ CHECK_CXX_SOURCE_RUNS(" @@ -46,7 +46,7 @@ index 7ff543dd..772f4c66 100644 ) add_custom_command(OUTPUT orc_proto.pb.h orc_proto.pb.cc -@@ -236,11 +231,11 @@ endif(BUILD_LIBHDFSPP) +@@ -230,11 +225,11 @@ endif(BUILD_LIBHDFSPP) add_library (orc STATIC ${SOURCE_FILES}) target_link_libraries (orc @@ -64,7 +64,7 @@ index 7ff543dd..772f4c66 100644 ) diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt -index ae4b807b..da5ef577 100644 +index ea390238..2d26f97b 100644 --- a/c++/test/CMakeLists.txt +++ b/c++/test/CMakeLists.txt @@ -14,10 +14,6 @@ include_directories( @@ -78,7 +78,7 @@ index ae4b807b..da5ef577 100644 ) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_FLAGS} ${WARN_FLAGS}") -@@ -54,11 +50,11 @@ add_executable (orc-test +@@ -51,11 +47,11 @@ add_executable (orc-test target_link_libraries (orc-test orc @@ -95,7 +95,7 @@ index ae4b807b..da5ef577 100644 ) add_executable (create-test-files -@@ -67,7 +63,7 @@ add_executable (create-test-files +@@ -64,7 +60,7 @@ add_executable (create-test-files target_link_libraries (create-test-files orc @@ -482,7 +482,7 @@ index e0889769..02c5889a 100644 + ZSTD_LIBRARY ) diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake -index 3a353257..f3e1089c 100644 +index fc4409cb..2b288168 100644 --- a/cmake_modules/ThirdpartyToolchain.cmake +++ b/cmake_modules/ThirdpartyToolchain.cmake @@ -17,6 +17,13 @@ set(GTEST_VERSION "1.8.0") @@ -499,7 +499,7 @@ index 3a353257..f3e1089c 100644 # zstd requires us to add the threads FIND_PACKAGE(Threads REQUIRED) -@@ -75,15 +82,21 @@ else () +@@ -79,15 +86,21 @@ else () ${THIRDPARTY_LOG_OPTIONS} BUILD_BYPRODUCTS "${SNAPPY_STATIC_LIB}") @@ -525,7 +525,7 @@ index 3a353257..f3e1089c 100644 if (INSTALL_VENDORED_LIBS) install(FILES "${SNAPPY_STATIC_LIB}" DESTINATION "lib") -@@ -117,15 +130,21 @@ else () +@@ -125,15 +138,21 @@ else () ${THIRDPARTY_LOG_OPTIONS} BUILD_BYPRODUCTS "${ZLIB_STATIC_LIB}") @@ -551,7 +551,7 @@ index 3a353257..f3e1089c 100644 if (INSTALL_VENDORED_LIBS) install(FILES "${ZLIB_STATIC_LIB}" DESTINATION "lib") -@@ -166,15 +185,21 @@ else () +@@ -178,15 +197,21 @@ else () ${THIRDPARTY_LOG_OPTIONS} BUILD_BYPRODUCTS ${ZSTD_STATIC_LIB}) @@ -577,7 +577,7 @@ index 3a353257..f3e1089c 100644 if (INSTALL_VENDORED_LIBS) install(FILES "${ZSTD_STATIC_LIB}" DESTINATION "lib") -@@ -208,15 +233,21 @@ else () +@@ -224,15 +249,21 @@ else () ${THIRDPARTY_LOG_OPTIONS} BUILD_BYPRODUCTS ${LZ4_STATIC_LIB}) @@ -603,7 +603,7 @@ index 3a353257..f3e1089c 100644 if (INSTALL_VENDORED_LIBS) install(FILES "${LZ4_STATIC_LIB}" DESTINATION "lib") -@@ -267,21 +298,33 @@ if (BUILD_CPP_TESTS) +@@ -287,21 +318,33 @@ if (BUILD_CPP_TESTS) CMAKE_ARGS ${GTEST_CMAKE_ARGS} BUILD_BYPRODUCTS "${GMOCK_STATIC_LIB}") @@ -644,7 +644,7 @@ index 3a353257..f3e1089c 100644 endif () endif () -@@ -322,20 +365,33 @@ else () +@@ -347,20 +390,33 @@ else () ${THIRDPARTY_LOG_OPTIONS} BUILD_BYPRODUCTS "${PROTOBUF_STATIC_LIB}" "${PROTOC_STATIC_LIB}") @@ -685,8 +685,8 @@ index 3a353257..f3e1089c 100644 if (INSTALL_VENDORED_LIBS) install(FILES "${PROTOBUF_STATIC_LIB}" "${PROTOC_STATIC_LIB}" DESTINATION "lib") -@@ -371,7 +427,7 @@ if(BUILD_LIBHDFSPP) - -DBUILD_SHARED_HDFSPP=FALSE) +@@ -400,7 +456,7 @@ if(BUILD_LIBHDFSPP) + endif () ExternalProject_Add (libhdfspp_ep - DEPENDS protobuf @@ -745,5 +745,5 @@ index 505fc8d2..29f54cb1 100644 if (TEST_VALGRIND_MEMCHECK) -- -2.26.2 +2.31.1 diff --git a/recipe/0003-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch b/recipe/0003-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch index c04669c..87b4c97 100644 --- a/recipe/0003-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch +++ b/recipe/0003-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch @@ -1,4 +1,4 @@ -From 92ff660fd3d1e82d1981ae4d02f73d74142f0f87 Mon Sep 17 00:00:00 2001 +From 967426cf31587cba49af8ee37d99babda8b60d5e Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Fri, 25 Sep 2020 14:49:59 -0400 Subject: [PATCH 3/3] Don't force orc to be a static library, let end user @@ -9,10 +9,10 @@ Subject: [PATCH 3/3] Don't force orc to be a static library, let end user 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt -index 772f4c66..cdade462 100644 +index 38482e93..438faf3f 100644 --- a/c++/src/CMakeLists.txt +++ b/c++/src/CMakeLists.txt -@@ -228,7 +228,7 @@ if(BUILD_LIBHDFSPP) +@@ -222,7 +222,7 @@ if(BUILD_LIBHDFSPP) add_definitions(-DBUILD_LIBHDFSPP) endif(BUILD_LIBHDFSPP) @@ -22,5 +22,5 @@ index 772f4c66..cdade462 100644 target_link_libraries (orc orc::protobuf -- -2.26.2 +2.31.1 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d81be75..7d8ad95 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.6.10" %} +{% set version = "1.6.11" %} package: name: orc @@ -6,7 +6,7 @@ package: source: url: https://archive.apache.org/dist/orc/orc-{{ version }}/orc-{{ version }}.tar.gz - sha256: 3a7347c85d18e44dece97d98320313848ec1d60aa635136a5187eafec7632ad2 + sha256: 67c17c012bd588fc5e8195b23fe92c2cb59aa6e20d57ed3dceb3a5f0b0b4c459 patches: # ORC builds by default with -Werror but some dependencies omit warnings. # This deactivates -Werror @@ -15,7 +15,7 @@ source: - 0003-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch build: - number: 1 + number: 0 skip: true # [win] run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From f24f704436025c952cf966ddfea41ccae6c90712 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Fri, 17 Sep 2021 22:35:51 -0400 Subject: [PATCH 024/105] Bump version to 1.7.0 --- ...vate-aggressive-failures-on-warnings.patch | 8 +- ...o-be-a-static-library-let-end-user-.patch} | 8 +- ...-cmake-modules-to-accommodate-librar.patch | 749 ------------------ recipe/meta.yaml | 7 +- 4 files changed, 11 insertions(+), 761 deletions(-) rename recipe/{0003-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch => 0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch} (71%) delete mode 100644 recipe/0002-Partially-rework-cmake-modules-to-accommodate-librar.patch diff --git a/recipe/0001-Deactivate-aggressive-failures-on-warnings.patch b/recipe/0001-Deactivate-aggressive-failures-on-warnings.patch index 3b3d8d0..215a070 100644 --- a/recipe/0001-Deactivate-aggressive-failures-on-warnings.patch +++ b/recipe/0001-Deactivate-aggressive-failures-on-warnings.patch @@ -1,17 +1,17 @@ -From 0dd2bb84d53c2ec12c0c1d34c574b77584d966da Mon Sep 17 00:00:00 2001 +From e58ecc69728783e0012dd7091228c2902223d425 Mon Sep 17 00:00:00 2001 From: "Korn, Uwe" Date: Tue, 19 Mar 2019 11:16:02 +0100 -Subject: [PATCH 1/3] Deactivate aggressive failures on warnings +Subject: [PATCH 1/2] Deactivate aggressive failures on warnings --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 285f3f7b..b0bc4e9c 100644 +index 7c0e8413..03708879 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -121,6 +121,8 @@ elseif (MSVC) +@@ -124,6 +124,8 @@ elseif (MSVC) set (WARN_FLAGS "${WARN_FLAGS} -wd4146") # unary minus operator applied to unsigned type, result still unsigned endif () diff --git a/recipe/0003-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch b/recipe/0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch similarity index 71% rename from recipe/0003-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch rename to recipe/0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch index 87b4c97..b0e9642 100644 --- a/recipe/0003-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch +++ b/recipe/0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch @@ -1,7 +1,7 @@ -From 967426cf31587cba49af8ee37d99babda8b60d5e Mon Sep 17 00:00:00 2001 +From 63812f30cbdda9cb5dc862622b86eb03e12f6940 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Fri, 25 Sep 2020 14:49:59 -0400 -Subject: [PATCH 3/3] Don't force orc to be a static library, let end user +Subject: [PATCH 2/2] Don't force orc to be a static library, let end user control it --- @@ -9,10 +9,10 @@ Subject: [PATCH 3/3] Don't force orc to be a static library, let end user 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt -index 38482e93..438faf3f 100644 +index 772f4c66..cdade462 100644 --- a/c++/src/CMakeLists.txt +++ b/c++/src/CMakeLists.txt -@@ -222,7 +222,7 @@ if(BUILD_LIBHDFSPP) +@@ -228,7 +228,7 @@ if(BUILD_LIBHDFSPP) add_definitions(-DBUILD_LIBHDFSPP) endif(BUILD_LIBHDFSPP) diff --git a/recipe/0002-Partially-rework-cmake-modules-to-accommodate-librar.patch b/recipe/0002-Partially-rework-cmake-modules-to-accommodate-librar.patch deleted file mode 100644 index b2c8f08..0000000 --- a/recipe/0002-Partially-rework-cmake-modules-to-accommodate-librar.patch +++ /dev/null @@ -1,749 +0,0 @@ -From c215bd7f01089caea8b6f271034a509cbad85bf7 Mon Sep 17 00:00:00 2001 -From: Nehal J Wani -Date: Sat, 29 Aug 2020 13:37:21 -0400 -Subject: [PATCH 2/3] Partially rework cmake modules to accommodate library - types - -This patch allows selectively linking each third party library -statically with a fallback to dynamic, if not available ---- - c++/src/CMakeLists.txt | 17 ++-- - c++/test/CMakeLists.txt | 16 ++-- - cmake_modules/FindGTest.cmake | 37 ++++++-- - cmake_modules/FindLZ4.cmake | 21 +++-- - cmake_modules/FindProtobuf.cmake | 27 ++++-- - cmake_modules/FindSnappy.cmake | 21 +++-- - cmake_modules/FindZLIB.cmake | 20 ++-- - cmake_modules/FindZSTD.cmake | 24 ++--- - cmake_modules/ThirdpartyToolchain.cmake | 118 +++++++++++++++++------- - tools/src/CMakeLists.txt | 3 +- - tools/test/CMakeLists.txt | 11 +-- - 11 files changed, 200 insertions(+), 115 deletions(-) - -diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt -index 3d4a1629..38482e93 100644 ---- a/c++/src/CMakeLists.txt -+++ b/c++/src/CMakeLists.txt -@@ -155,7 +155,7 @@ CHECK_CXX_SOURCE_RUNS(" - ) - - set(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIR}) --set(CMAKE_REQUIRED_LIBRARIES zlib) -+set(CMAKE_REQUIRED_LIBRARIES orc_zlib) - CHECK_CXX_SOURCE_COMPILES(" - #define Z_PREFIX - #include -@@ -174,12 +174,7 @@ configure_file ( - include_directories ( - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} -- ${PROTOBUF_INCLUDE_DIR} -- ${ZLIB_INCLUDE_DIR} -- ${SNAPPY_INCLUDE_DIR} -- ${LZ4_INCLUDE_DIR} - ${LIBHDFSPP_INCLUDE_DIR} -- ${ZSTD_INCLUDE_DIR} - ) - - add_custom_command(OUTPUT orc_proto.pb.h orc_proto.pb.cc -@@ -230,11 +225,11 @@ endif(BUILD_LIBHDFSPP) - add_library (orc STATIC ${SOURCE_FILES}) - - target_link_libraries (orc -- protobuf -- zlib -- snappy -- lz4 -- zstd -+ orc::protobuf -+ orc::zlib -+ orc::snappy -+ orc::lz4 -+ orc::zstd - ${LIBHDFSPP_LIBRARIES} - ) - -diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt -index ea390238..2d26f97b 100644 ---- a/c++/test/CMakeLists.txt -+++ b/c++/test/CMakeLists.txt -@@ -14,10 +14,6 @@ include_directories( - ${PROJECT_SOURCE_DIR}/c++/src - ${PROJECT_BINARY_DIR}/c++/include - ${PROJECT_BINARY_DIR}/c++/src -- ${PROTOBUF_INCLUDE_DIR} -- ${ZLIB_INCLUDE_DIR} -- ${SNAPPY_INCLUDE_DIR} -- ${GTEST_INCLUDE_DIR} - ) - - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_FLAGS} ${WARN_FLAGS}") -@@ -51,11 +47,11 @@ add_executable (orc-test - - target_link_libraries (orc-test - orc -- lz4 -- protobuf -- snappy -- zlib -- ${GTEST_LIBRARIES} -+ orc::lz4 -+ orc::protobuf -+ orc::snappy -+ orc::zlib -+ orc::gmock - ) - - add_executable (create-test-files -@@ -64,7 +60,7 @@ add_executable (create-test-files - - target_link_libraries (create-test-files - orc -- protobuf -+ orc::protobuf - ) - - if (TEST_VALGRIND_MEMCHECK) -diff --git a/cmake_modules/FindGTest.cmake b/cmake_modules/FindGTest.cmake -index 3ae89543..c1326ea5 100644 ---- a/cmake_modules/FindGTest.cmake -+++ b/cmake_modules/FindGTest.cmake -@@ -13,8 +13,10 @@ - # GTEST_HOME environmental variable is used to check for GTest headers and static library - - # GTEST_INCLUDE_DIR: directory containing headers --# GTEST_LIBS: directory containing gtest libraries -+# GMOCK_LIBRARY: path to libgmock -+# GTEST_LIBRARY: path to libgtest - # GMOCK_STATIC_LIB: is set to gmock.a static library -+# GTEST_STATIC_LIB: is set to gtest.a static library - # GTEST_FOUND is set if GTEST is found - - if (NOT "${GTEST_HOME}" STREQUAL "") -@@ -28,24 +30,40 @@ find_path (GTEST_INCLUDE_DIR gmock/gmock.h HINTS - NO_DEFAULT_PATH - PATH_SUFFIXES "include") - --find_library (GTEST_LIBRARIES NAMES gmock HINTS -+find_library (GMOCK_LIBRARY NAMES gmock HINTS - ${_gtest_path} - PATH_SUFFIXES "lib") - --if (GTEST_INCLUDE_DIR AND GTEST_LIBRARIES) -+find_library (GTEST_LIBRARY NAMES gtest HINTS -+ ${_gtest_path} -+ PATH_SUFFIXES "lib") -+ -+find_library (GMOCK_STATIC_LIB NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX} HINTS -+ ${_gtest_path} -+ PATH_SUFFIXES "lib") -+ -+find_library (GTEST_STATIC_LIB NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX} HINTS -+ ${_gtest_path} -+ PATH_SUFFIXES "lib") -+ -+if (GTEST_INCLUDE_DIR AND GMOCK_LIBRARY) - set (GTEST_FOUND TRUE) -- get_filename_component (GTEST_LIBS ${GTEST_LIBRARIES} PATH ) - set (GTEST_HEADER_NAME gmock/gmock.h) - set (GTEST_HEADER ${GTEST_INCLUDE_DIR}/${GTEST_HEADER_NAME}) -- set (GTEST_LIB_NAME gmock) -- set (GMOCK_STATIC_LIB ${GTEST_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${GTEST_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}) - else () - set (GTEST_FOUND FALSE) - endif () - - if (GTEST_FOUND) - message (STATUS "Found the GTest header: ${GTEST_HEADER}") -- message (STATUS "Found the GTest library: ${GMOCK_STATIC_LIB}") -+ message (STATUS "Found the GTest library: ${GTEST_LIBRARY}") -+ message (STATUS "Found the GMock library: ${GMOCK_LIBRARY}") -+ if (GTEST_STATIC_LIB) -+ message (STATUS "Found the GTest static library: ${GTEST_STATIC_LIB}") -+ endif () -+ if (GMOCK_STATIC_LIB) -+ message (STATUS "Found the GMock static library: ${GMOCK_STATIC_LIB}") -+ endif () - else () - if (_gtest_path) - set (GTEST_ERR_MSG "Could not find GTest. Looked in ${_gtest_path}.") -@@ -63,6 +81,7 @@ endif () - mark_as_advanced ( - GTEST_INCLUDE_DIR - GMOCK_STATIC_LIB -- GTEST_LIBS -- GTEST_LIBRARIES -+ GTEST_STATIC_LIB -+ GMOCK_LIBRARY -+ GTEST_LIBRARY - ) -diff --git a/cmake_modules/FindLZ4.cmake b/cmake_modules/FindLZ4.cmake -index e522a6f7..f5798494 100644 ---- a/cmake_modules/FindLZ4.cmake -+++ b/cmake_modules/FindLZ4.cmake -@@ -13,7 +13,7 @@ - # LZ4_HOME environment variable is used to check for LZ4 headers and static library - - # LZ4_INCLUDE_DIR: directory containing headers --# LZ4_LIBS: directory containing LZ4 libraries -+# LZ4_LIBRARY: path to liblz4 - # LZ4_STATIC_LIB: path to lz4.a - # LZ4_FOUND: whether LZ4 has been found - -@@ -28,24 +28,28 @@ find_path (LZ4_INCLUDE_DIR lz4.h HINTS - NO_DEFAULT_PATH - PATH_SUFFIXES "include") - --find_library (LZ4_LIBRARIES NAMES lz4 HINTS -+find_library (LZ4_LIBRARY NAMES lz4 HINTS - ${_lz4_path} - PATH_SUFFIXES "lib" "lib64") - --if (LZ4_INCLUDE_DIR AND LZ4_LIBRARIES) -+find_library (LZ4_STATIC_LIB NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}${LZ4_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX} HINTS -+ ${_lz4_path} -+ PATH_SUFFIXES "lib" "lib64") -+ -+if (LZ4_INCLUDE_DIR AND LZ4_LIBRARY) - set (LZ4_FOUND TRUE) -- get_filename_component (LZ4_LIBS ${LZ4_LIBRARIES} PATH) - set (LZ4_HEADER_NAME lz4.h) - set (LZ4_HEADER ${LZ4_INCLUDE_DIR}/${LZ4_HEADER_NAME}) -- set (LZ4_LIB_NAME lz4) -- set (LZ4_STATIC_LIB ${LZ4_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${LZ4_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}) - else () - set (LZ4_FOUND FALSE) - endif () - - if (LZ4_FOUND) - message (STATUS "Found the LZ4 header: ${LZ4_HEADER}") -- message (STATUS "Found the LZ4 library: ${LZ4_STATIC_LIB}") -+ message (STATUS "Found the LZ4 library: ${LZ4_LIBRARY}") -+ if (LZ4_STATIC_LIB) -+ message (STATUS "Found the LZ4 static library: ${LZ4_STATIC_LIB}") -+ endif () - else() - if (_lz4_path) - set (LZ4_ERR_MSG "Could not find LZ4. Looked in ${_lz4_path}.") -@@ -63,6 +67,5 @@ endif() - mark_as_advanced ( - LZ4_INCLUDE_DIR - LZ4_STATIC_LIB -- LZ4_LIBS -- LZ4_LIBRARIES -+ LZ4_LIBRARY - ) -diff --git a/cmake_modules/FindProtobuf.cmake b/cmake_modules/FindProtobuf.cmake -index d901c55a..f2b6a7ca 100644 ---- a/cmake_modules/FindProtobuf.cmake -+++ b/cmake_modules/FindProtobuf.cmake -@@ -14,8 +14,9 @@ - - # PROTOBUF_FOUND is set if Protobuf is found - # PROTOBUF_INCLUDE_DIR: directory containing headers --# PROTOBUF_LIBS: directory containing Protobuf libraries -+# PROTOBUF_LIBRARY: location of libprotobuf - # PROTOBUF_STATIC_LIB: location of protobuf.a -+# PROTOC_LIBRARY: location of libprotoc - # PROTOC_STATIC_LIB: location of protoc.a - # PROTOBUF_EXECUTABLE: location of protoc - -@@ -40,10 +41,18 @@ find_library (PROTOBUF_LIBRARY NAMES protobuf HINTS - ${_protobuf_path} - PATH_SUFFIXES "lib") - -+find_library (PROTOBUF_STATIC_LIB NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}protobuf${CMAKE_STATIC_LIBRARY_SUFFIX} HINTS -+ ${_protobuf_path} -+ PATH_SUFFIXES "lib") -+ - find_library (PROTOC_LIBRARY NAMES protoc HINTS - ${_protobuf_path} - PATH_SUFFIXES "lib") - -+find_library (PROTOC_STATIC_LIB NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}protoc${CMAKE_STATIC_LIBRARY_SUFFIX} HINTS -+ ${_protobuf_path} -+ PATH_SUFFIXES "lib") -+ - find_program(PROTOBUF_EXECUTABLE protoc HINTS - ${_protobuf_path} - NO_DEFAULT_PATH -@@ -51,20 +60,23 @@ find_program(PROTOBUF_EXECUTABLE protoc HINTS - - if (PROTOBUF_INCLUDE_DIR AND PROTOBUF_LIBRARY AND PROTOC_LIBRARY AND PROTOBUF_EXECUTABLE) - set (PROTOBUF_FOUND TRUE) -- get_filename_component (PROTOBUF_LIBS ${PROTOBUF_LIBRARY} PATH) - set (PROTOBUF_LIB_NAME protobuf) - set (PROTOC_LIB_NAME protoc) -- set (PROTOBUF_STATIC_LIB ${PROTOBUF_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${PROTOBUF_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}) -- set (PROTOC_STATIC_LIB ${PROTOBUF_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${PROTOC_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}) - else () - set (PROTOBUF_FOUND FALSE) - endif () - - if (PROTOBUF_FOUND) - message (STATUS "Found the Protobuf headers: ${PROTOBUF_INCLUDE_DIR}") -- message (STATUS "Found the Protobuf library: ${PROTOBUF_STATIC_LIB}") -- message (STATUS "Found the Protoc library: ${PROTOC_STATIC_LIB}") -+ message (STATUS "Found the Protobuf library: ${PROTOBUF_LIBRARY}") -+ message (STATUS "Found the Protoc library: ${PROTOC_LIBRARY}") - message (STATUS "Found the Protoc executable: ${PROTOBUF_EXECUTABLE}") -+ if (PROTOBUF_STATIC_LIB) -+ message (STATUS "Found the Protobuf static library: ${PROTOBUF_STATIC_LIB}") -+ endif () -+ if (PROTOC_STATIC_LIB) -+ message (STATUS "Found the Protoc static library: ${PROTOC_STATIC_LIB}") -+ endif () - else() - if (_protobuf_path) - set (PROTOBUF_ERR_MSG "Could not find Protobuf. Looked in ${_protobuf_path}.") -@@ -81,7 +93,8 @@ endif() - - mark_as_advanced ( - PROTOBUF_INCLUDE_DIR -- PROTOBUF_LIBS -+ PROTOBUF_LIBRARY - PROTOBUF_STATIC_LIB - PROTOC_STATIC_LIB -+ PROTOC_LIBRARY - ) -diff --git a/cmake_modules/FindSnappy.cmake b/cmake_modules/FindSnappy.cmake -index 5aeb88e7..a834dd0d 100644 ---- a/cmake_modules/FindSnappy.cmake -+++ b/cmake_modules/FindSnappy.cmake -@@ -13,7 +13,7 @@ - # SNAPPY_HOME environmental variable is used to check for Snappy headers and static library - - # SNAPPY_INCLUDE_DIR: directory containing headers --# SNAPPY_LIBS: directory containing snappy libraries -+# SNAPPY_LIBRARY: path to libsnappy - # SNAPPY_STATIC_LIB: path to libsnappy.a - # SNAPPY_FOUND: whether snappy has been found - -@@ -28,24 +28,28 @@ find_path (SNAPPY_INCLUDE_DIR snappy.h HINTS - NO_DEFAULT_PATH - PATH_SUFFIXES "include") - --find_library (SNAPPY_LIBRARIES NAMES snappy HINTS -+find_library (SNAPPY_LIBRARY NAMES snappy HINTS - ${_snappy_path} - PATH_SUFFIXES "lib" "lib64") - --if (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARIES) -+find_library (SNAPPY_STATIC_LIB NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}${SNAPPY_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX} HINTS -+ ${_snappy_path} -+ PATH_SUFFIXES "lib" "lib64") -+ -+if (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARY) - set (SNAPPY_FOUND TRUE) -- get_filename_component (SNAPPY_LIBS ${SNAPPY_LIBRARIES} PATH) - set (SNAPPY_HEADER_NAME snappy.h) - set (SNAPPY_HEADER ${SNAPPY_INCLUDE_DIR}/${SNAPPY_HEADER_NAME}) -- set (SNAPPY_LIB_NAME snappy) -- set (SNAPPY_STATIC_LIB ${SNAPPY_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${SNAPPY_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}) - else () - set (SNAPPY_FOUND FALSE) - endif () - - if (SNAPPY_FOUND) - message (STATUS "Found the Snappy header: ${SNAPPY_HEADER}") -- message (STATUS "Found the Snappy library: ${SNAPPY_STATIC_LIB}") -+ message (STATUS "Found the Snappy library: ${SNAPPY_LIBRARY}") -+ if (SNAPPY_STATIC_LIB) -+ message (STATUS "Found the Snappy static library: ${SNAPPY_STATIC_LIB}") -+ endif() - else() - if (_snappy_path) - set (SNAPPY_ERR_MSG "Could not find Snappy. Looked in ${_snappy_path}.") -@@ -63,6 +67,5 @@ endif() - mark_as_advanced ( - SNAPPY_INCLUDE_DIR - SNAPPY_STATIC_LIB -- SNAPPY_LIBS -- SNAPPY_LIBRARIES -+ SNAPPY_LIBRARY - ) -diff --git a/cmake_modules/FindZLIB.cmake b/cmake_modules/FindZLIB.cmake -index 6c09640e..968d1482 100644 ---- a/cmake_modules/FindZLIB.cmake -+++ b/cmake_modules/FindZLIB.cmake -@@ -13,7 +13,7 @@ - # ZLIB_HOME environmental variable is used to check for ZLIB headers and static library - - # ZLIB_INCLUDE_DIR: directory containing headers --# ZLIB_LIBS: directory containing ZLIB libraries -+# ZLIB_LIBRARY: path to libz/libzlib - # ZLIB_STATIC_LIB: path to zlib.a - # ZLIB_FOUND: whether ZLIB has been found - -@@ -32,23 +32,28 @@ if (NOT ZLIB_STATIC_LIB_NAME) - set (ZLIB_STATIC_LIB_NAME z) - endif() - --find_library (ZLIB_LIBRARIES NAMES ${ZLIB_STATIC_LIB_NAME} HINTS -+find_library (ZLIB_LIBRARY NAMES z zlib ${ZLIB_STATIC_LIB_NAME} HINTS - ${_zlib_path} - PATH_SUFFIXES "lib") - --if (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARIES) -+find_library (ZLIB_STATIC_LIB NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}${ZLIB_STATIC_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX} HINTS -+ ${_zlib_path} -+ PATH_SUFFIXES "lib") -+ -+if (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY) - set (ZLIB_FOUND TRUE) -- get_filename_component (ZLIB_LIBS ${ZLIB_LIBRARIES} PATH ) - set (ZLIB_HEADER_NAME zlib.h) - set (ZLIB_HEADER ${ZLIB_INCLUDE_DIR}/${ZLIB_HEADER_NAME}) -- set (ZLIB_STATIC_LIB ${ZLIB_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${ZLIB_STATIC_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}) - else () - set (ZLIB_FOUND FALSE) - endif () - - if (ZLIB_FOUND) - message (STATUS "Found the ZLIB header: ${ZLIB_HEADER}") -- message (STATUS "Found the ZLIB library: ${ZLIB_STATIC_LIB}") -+ message (STATUS "Found the ZLIB library: ${ZLIB_LIBRARY}") -+ if (ZLIB_STATIC_LIB) -+ message (STATUS "Found the ZLIB static library: ${ZLIB_STATIC_LIB}") -+ endif () - else() - if (_zlib_path) - set (ZLIB_ERR_MSG "Could not find ZLIB. Looked in ${_zlib_path}.") -@@ -66,6 +71,5 @@ endif() - mark_as_advanced ( - ZLIB_INCLUDE_DIR - ZLIB_STATIC_LIB -- ZLIB_LIBS -- ZLIB_LIBRARIES -+ ZLIB_LIBRARY - ) -diff --git a/cmake_modules/FindZSTD.cmake b/cmake_modules/FindZSTD.cmake -index e0889769..02c5889a 100644 ---- a/cmake_modules/FindZSTD.cmake -+++ b/cmake_modules/FindZSTD.cmake -@@ -13,7 +13,7 @@ - # ZSTD_HOME environmental variable is used to check for Zstd headers and static library - - # ZSTD_INCLUDE_DIR: directory containing headers --# ZSTD_LIBS: directory containing zstd libraries -+# ZSTD_LIBRARY: path to libzstd - # ZSTD_STATIC_LIB: path to libzstd.a - # ZSTD_FOUND: whether zstd has been found - -@@ -23,32 +23,33 @@ endif() - - message (STATUS "ZSTD_HOME: ${ZSTD_HOME}") - --if (NOT ZSTD_STATIC_LIB_NAME) -- set (ZSTD_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}zstd) --endif() -- - find_path (ZSTD_INCLUDE_DIR zstd.h HINTS - ${_zstd_path} - NO_DEFAULT_PATH - PATH_SUFFIXES "include") - --find_library (ZSTD_LIBRARIES NAMES ${ZSTD_STATIC_LIB_NAME} HINTS -+find_library (ZSTD_LIBRARY NAMES zstd HINTS -+ ${_zstd_path} -+ PATH_SUFFIXES "lib") -+ -+find_library (ZSTD_STATIC_LIB NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}zstd${CMAKE_STATIC_LIBRARY_SUFFIX} HINTS - ${_zstd_path} - PATH_SUFFIXES "lib") - --if (ZSTD_INCLUDE_DIR AND ZSTD_LIBRARIES) -+if (ZSTD_INCLUDE_DIR AND ZSTD_LIBRARY) - set (ZSTD_FOUND TRUE) -- get_filename_component (ZSTD_LIBS ${ZSTD_LIBRARIES} PATH) - set (ZSTD_HEADER_NAME zstd.h) - set (ZSTD_HEADER ${ZSTD_INCLUDE_DIR}/${ZSTD_HEADER_NAME}) -- set (ZSTD_STATIC_LIB ${ZSTD_LIBS}/${ZSTD_STATIC_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}) - else () - set (ZSTD_FOUND FALSE) - endif () - - if (ZSTD_FOUND) - message (STATUS "Found the zstd header: ${ZSTD_HEADER}") -- message (STATUS "Found the zstd library: ${ZSTD_STATIC_LIB}") -+ message (STATUS "Found the zstd library: ${ZSTD_LIBRARY}") -+ if (ZSTD_STATIC_LIB) -+ message (STATUS "Found the zstd static library: ${ZSTD_STATIC_LIB}") -+ endif () - else() - if (_ZSTD_path) - set (ZSTD_ERR_MSG "Could not find zstd. Looked in ${_zstd_path}.") -@@ -66,6 +67,5 @@ endif() - mark_as_advanced ( - ZSTD_INCLUDE_DIR - ZSTD_STATIC_LIB -- ZSTD_LIBS -- ZSTD_LIBRARIES -+ ZSTD_LIBRARY - ) -diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake -index fc4409cb..2b288168 100644 ---- a/cmake_modules/ThirdpartyToolchain.cmake -+++ b/cmake_modules/ThirdpartyToolchain.cmake -@@ -17,6 +17,13 @@ set(GTEST_VERSION "1.8.0") - set(PROTOBUF_VERSION "3.5.1") - set(ZSTD_VERSION "1.4.5") - -+option(ORC_PREFER_STATIC_PROTOBUF "Prefer static protobuf library, if available" ON) -+option(ORC_PREFER_STATIC_SNAPPY "Prefer static snappy library, if available" ON) -+option(ORC_PREFER_STATIC_LZ4 "Prefer static lz4 library, if available" ON) -+option(ORC_PREFER_STATIC_ZSTD "Prefer static zstd library, if available" ON) -+option(ORC_PREFER_STATIC_ZLIB "Prefer static zlib library, if available" ON) -+option(ORC_PREFER_STATIC_GMOCK "Prefer static gmock library, if available" ON) -+ - # zstd requires us to add the threads - FIND_PACKAGE(Threads REQUIRED) - -@@ -79,15 +86,21 @@ else () - ${THIRDPARTY_LOG_OPTIONS} - BUILD_BYPRODUCTS "${SNAPPY_STATIC_LIB}") - -+ set(SNAPPY_LIBRARY ${SNAPPY_STATIC_LIB}) - set(SNAPPY_VENDORED TRUE) - endif () - --include_directories (SYSTEM ${SNAPPY_INCLUDE_DIR}) --add_library (snappy STATIC IMPORTED) --set_target_properties (snappy PROPERTIES IMPORTED_LOCATION ${SNAPPY_STATIC_LIB}) -+add_library (orc_snappy INTERFACE) -+add_library (orc::snappy ALIAS orc_snappy) -+if (ORC_PREFER_STATIC_SNAPPY AND ${SNAPPY_STATIC_LIB}) -+ target_link_libraries(orc_snappy INTERFACE ${SNAPPY_STATIC_LIB}) -+else () -+ target_link_libraries(orc_snappy INTERFACE ${SNAPPY_LIBRARY}) -+endif () -+target_include_directories (orc_snappy SYSTEM INTERFACE ${SNAPPY_INCLUDE_DIR}) - - if (SNAPPY_VENDORED) -- add_dependencies (snappy snappy_ep) -+ add_dependencies (orc_snappy snappy_ep) - if (INSTALL_VENDORED_LIBS) - install(FILES "${SNAPPY_STATIC_LIB}" - DESTINATION "lib") -@@ -125,15 +138,21 @@ else () - ${THIRDPARTY_LOG_OPTIONS} - BUILD_BYPRODUCTS "${ZLIB_STATIC_LIB}") - -+ set(ZLIB_LIBRARY ${ZLIB_STATIC_LIB}) - set(ZLIB_VENDORED TRUE) - endif () - --include_directories (SYSTEM ${ZLIB_INCLUDE_DIR}) --add_library (zlib STATIC IMPORTED) --set_target_properties (zlib PROPERTIES IMPORTED_LOCATION ${ZLIB_STATIC_LIB}) -+add_library (orc_zlib INTERFACE) -+add_library (orc::zlib ALIAS orc_zlib) -+if (ORC_PREFER_STATIC_ZLIB AND ${ZLIB_STATIC_LIB}) -+ target_link_libraries (orc_zlib INTERFACE ${ZLIB_LIBRARY}) -+else () -+ target_link_libraries (orc_zlib INTERFACE ${ZLIB_STATIC_LIB}) -+endif () -+target_include_directories (orc_zlib SYSTEM INTERFACE ${ZLIB_INCLUDE_DIR}) - - if (ZLIB_VENDORED) -- add_dependencies (zlib zlib_ep) -+ add_dependencies (orc_zlib zlib_ep) - if (INSTALL_VENDORED_LIBS) - install(FILES "${ZLIB_STATIC_LIB}" - DESTINATION "lib") -@@ -178,15 +197,21 @@ else () - ${THIRDPARTY_LOG_OPTIONS} - BUILD_BYPRODUCTS ${ZSTD_STATIC_LIB}) - -+ set(ZSTD_LIBRARY ${ZSTD_STATIC_LIB}) - set(ZSTD_VENDORED TRUE) - endif () - --include_directories (SYSTEM ${ZSTD_INCLUDE_DIR}) --add_library (zstd STATIC IMPORTED) --set_target_properties (zstd PROPERTIES IMPORTED_LOCATION ${ZSTD_STATIC_LIB}) -+add_library (orc_zstd INTERFACE) -+add_library (orc::zstd ALIAS orc_zstd) -+if (ORC_PREFER_STATIC_ZSTD AND ${ZSTD_STATIC_LIB}) -+ target_link_libraries (orc_zstd INTERFACE ${ZSTD_STATIC_LIB}) -+else () -+ target_link_libraries (orc_zstd INTERFACE ${ZSTD_LIBRARY}) -+endif () -+target_include_directories (orc_zstd SYSTEM INTERFACE ${ZSTD_INCLUDE_DIR}) - - if (ZSTD_VENDORED) -- add_dependencies (zstd zstd_ep) -+ add_dependencies (orc_zstd zstd_ep) - if (INSTALL_VENDORED_LIBS) - install(FILES "${ZSTD_STATIC_LIB}" - DESTINATION "lib") -@@ -224,15 +249,21 @@ else () - ${THIRDPARTY_LOG_OPTIONS} - BUILD_BYPRODUCTS ${LZ4_STATIC_LIB}) - -+ set(LZ4_LIBRARY ${LZ4_STATIC_LIB}) - set(LZ4_VENDORED TRUE) - endif () - --include_directories (SYSTEM ${LZ4_INCLUDE_DIR}) --add_library (lz4 STATIC IMPORTED) --set_target_properties (lz4 PROPERTIES IMPORTED_LOCATION ${LZ4_STATIC_LIB}) -+add_library (orc_lz4 INTERFACE) -+add_library (orc::lz4 ALIAS orc_lz4) -+if (ORC_PREFER_STATIC_LZ4 AND ${LZ4_STATIC_LIB}) -+ target_link_libraries (orc_lz4 INTERFACE ${LZ4_STATIC_LIB}) -+else () -+ target_link_libraries (orc_lz4 INTERFACE ${LZ4_LIBRARY}) -+endif () -+target_include_directories (orc_lz4 SYSTEM INTERFACE ${LZ4_INCLUDE_DIR}) - - if (LZ4_VENDORED) -- add_dependencies (lz4 lz4_ep) -+ add_dependencies (orc_lz4 lz4_ep) - if (INSTALL_VENDORED_LIBS) - install(FILES "${LZ4_STATIC_LIB}" - DESTINATION "lib") -@@ -287,21 +318,33 @@ if (BUILD_CPP_TESTS) - CMAKE_ARGS ${GTEST_CMAKE_ARGS} - BUILD_BYPRODUCTS "${GMOCK_STATIC_LIB}") - -+ set(GMOCK_LIBRARY ${GMOCK_STATIC_LIB}) - set(GTEST_VENDORED TRUE) - endif () - -- include_directories (SYSTEM ${GTEST_INCLUDE_DIR}) -- -- add_library (gmock STATIC IMPORTED) -- set_target_properties (gmock PROPERTIES IMPORTED_LOCATION ${GMOCK_STATIC_LIB}) -+ # This is a bit special cased because gmock requires gtest and some -+ # distributions statically link gtest inside the gmock shared lib -+ add_library (orc_gmock INTERFACE) -+ add_library (orc::gmock ALIAS orc_gmock) -+ if (ORC_PREFER_STATIC_GMOCK AND ${GMOCK_STATIC_LIB}) -+ target_link_libraries (orc_gmock INTERFACE ${GMOCK_STATIC_LIB}) -+ if (NOT "${GTEST_STATIC_LIB}" STREQUAL "") -+ target_link_libraries (orc_gmock INTERFACE ${GTEST_STATIC_LIB}) -+ endif () -+ else () -+ target_link_libraries (orc_gmock INTERFACE ${GMOCK_LIBRARY}) -+ if (NOT "${GTEST_LIBRARY}" STREQUAL "") -+ target_link_libraries (orc_gmock INTERFACE ${GTEST_LIBRARY}) -+ endif () -+ endif () -+ target_include_directories (orc_gmock SYSTEM INTERFACE ${GTEST_INCLUDE_DIR}) - - if (GTEST_VENDORED) -- add_dependencies (gmock googletest_ep) -+ add_dependencies (orc_gmock googletest_ep) - endif () - -- set(GTEST_LIBRARIES gmock) - if (NOT APPLE AND NOT MSVC) -- list (APPEND GTEST_LIBRARIES pthread) -+ target_link_libraries (orc_gmock INTERFACE Threads::Threads) - endif () - endif () - -@@ -347,20 +390,33 @@ else () - ${THIRDPARTY_LOG_OPTIONS} - BUILD_BYPRODUCTS "${PROTOBUF_STATIC_LIB}" "${PROTOC_STATIC_LIB}") - -+ set(PROTOBUF_LIBRARY ${PROTOBUF_STATIC_LIB}) -+ set(PROTOC_LIBRARY ${PROTOC_STATIC_LIB}) - set(PROTOBUF_VENDORED TRUE) - endif () - --include_directories (SYSTEM ${PROTOBUF_INCLUDE_DIR}) -+add_library (orc_protobuf INTERFACE) -+add_library (orc::protobuf ALIAS orc_protobuf) -+add_library (orc_protoc INTERFACE) -+add_library (orc::protoc ALIAS orc_protoc) - --add_library (protobuf STATIC IMPORTED) --set_target_properties (protobuf PROPERTIES IMPORTED_LOCATION ${PROTOBUF_STATIC_LIB}) -+if (ORC_PREFER_STATIC_PROTOBUF AND ${PROTOBUF_STATIC_LIB}) -+ target_link_libraries (orc_protobuf INTERFACE ${PROTOBUF_STATIC_LIB}) -+else () -+ target_link_libraries (orc_protobuf INTERFACE ${PROTOBUF_LIBRARY}) -+endif() -+target_include_directories (orc_protobuf SYSTEM INTERFACE ${PROTOBUF_INCLUDE_DIR}) - --add_library (protoc STATIC IMPORTED) --set_target_properties (protoc PROPERTIES IMPORTED_LOCATION ${PROTOC_STATIC_LIB}) -+if (ORC_PREFER_STATIC_PROTOBUF AND ${PROTOC_STATIC_LIB}) -+ target_link_libraries (orc_protoc INTERFACE ${PROTOC_STATIC_LIB}) -+else () -+ target_link_libraries (orc_protoc INTERFACE ${PROTOC_LIBRARY}) -+endif() -+target_include_directories (orc_protoc SYSTEM INTERFACE ${PROTOBUF_INCLUDE_DIR}) - - if (PROTOBUF_VENDORED) -- add_dependencies (protoc protobuf_ep) -- add_dependencies (protobuf protobuf_ep) -+ add_dependencies (orc_protoc protobuf_ep) -+ add_dependencies (orc_protobuf protobuf_ep) - if (INSTALL_VENDORED_LIBS) - install(FILES "${PROTOBUF_STATIC_LIB}" "${PROTOC_STATIC_LIB}" - DESTINATION "lib") -@@ -400,7 +456,7 @@ if(BUILD_LIBHDFSPP) - endif () - - ExternalProject_Add (libhdfspp_ep -- DEPENDS protobuf -+ DEPENDS orc::protobuf - URL ${LIBHDFSPP_SRC_URL} - LOG_DOWNLOAD 0 - LOG_CONFIGURE 0 -diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt -index f5a53ca8..4b6768c5 100644 ---- a/tools/src/CMakeLists.txt -+++ b/tools/src/CMakeLists.txt -@@ -22,7 +22,6 @@ include_directories ( - ${PROJECT_BINARY_DIR}/c++/include - ${PROJECT_SOURCE_DIR}/c++/src - ${PROJECT_BINARY_DIR}/c++/src -- ${PROTOBUF_INCLUDE_DIR} - ) - - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g ${CXX11_FLAGS} ${WARN_FLAGS}") -@@ -51,7 +50,7 @@ add_executable (orc-metadata - - target_link_libraries (orc-metadata - orc -- protobuf -+ orc::protobuf - ${CMAKE_THREAD_LIBS_INIT} - ) - -diff --git a/tools/test/CMakeLists.txt b/tools/test/CMakeLists.txt -index 505fc8d2..29f54cb1 100644 ---- a/tools/test/CMakeLists.txt -+++ b/tools/test/CMakeLists.txt -@@ -16,9 +16,6 @@ include_directories( - ${PROJECT_SOURCE_DIR}/tools-c++/src - ${PROJECT_BINARY_DIR}/c++/include - ${PROJECT_BINARY_DIR}/c++/src -- ${PROTOBUF_INCLUDE_DIR} -- ${ZLIB_INCLUDE_DIR} -- ${GTEST_INCLUDE_DIR} - ) - - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_FLAGS} ${WARN_FLAGS}") -@@ -36,10 +33,10 @@ add_executable (tool-test - - target_link_libraries (tool-test - orc -- protobuf -- zlib -- snappy -- ${GTEST_LIBRARIES} -+ orc::protobuf -+ orc::zlib -+ orc::snappy -+ orc::gmock - ) - - if (TEST_VALGRIND_MEMCHECK) --- -2.31.1 - diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7d8ad95..05cd1f7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.6.11" %} +{% set version = "1.7.0" %} package: name: orc @@ -6,13 +6,12 @@ package: source: url: https://archive.apache.org/dist/orc/orc-{{ version }}/orc-{{ version }}.tar.gz - sha256: 67c17c012bd588fc5e8195b23fe92c2cb59aa6e20d57ed3dceb3a5f0b0b4c459 + sha256: cab8cea768b391b173ad5ba839baf20ba9abc42570e3d661783c9c52e0430ab3 patches: # ORC builds by default with -Werror but some dependencies omit warnings. # This deactivates -Werror - 0001-Deactivate-aggressive-failures-on-warnings.patch - - 0002-Partially-rework-cmake-modules-to-accommodate-librar.patch - - 0003-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch + - 0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch build: number: 0 From 45d619ba0654b3abccc1ad0bd4bac8b01bae6569 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 8 Nov 2021 04:52:58 +0000 Subject: [PATCH 025/105] updated v1.7.1 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 05cd1f7..904717e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.7.0" %} +{% set version = "1.7.1" %} package: name: orc @@ -6,7 +6,7 @@ package: source: url: https://archive.apache.org/dist/orc/orc-{{ version }}/orc-{{ version }}.tar.gz - sha256: cab8cea768b391b173ad5ba839baf20ba9abc42570e3d661783c9c52e0430ab3 + sha256: 65d71e571238cbcb7c3cbb9a10f7ad988f452d17c58479154be3b9d6ec27d005 patches: # ORC builds by default with -Werror but some dependencies omit warnings. # This deactivates -Werror From d0f185a44cc16139f125270a0b328d8b30f3aa89 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 8 Nov 2021 04:53:35 +0000 Subject: [PATCH 026/105] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.14.3, and conda-forge-pinning 2021.11.08.01.51.47 --- .azure-pipelines/azure-pipelines-linux.yml | 9 +++++++ .azure-pipelines/azure-pipelines-osx.yml | 5 ++++ .ci_support/linux_64_.yaml | 2 +- .ci_support/linux_ppc64le_.yaml | 2 +- .ci_support/osx_64_.yaml | 2 +- .drone.yml | 31 ---------------------- .gitattributes | 1 + .scripts/build_steps.sh | 9 ++++--- .scripts/run_docker_build.sh | 7 +++-- .scripts/run_osx_build.sh | 8 +++--- README.md | 12 +++------ build-locally.py | 5 ++++ 12 files changed, 41 insertions(+), 52 deletions(-) delete mode 100644 .drone.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 91ac554..b360190 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -12,6 +12,10 @@ jobs: CONFIG: linux_64_ UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_aarch64_: + CONFIG: linux_aarch64_ + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 linux_ppc64le_: CONFIG: linux_ppc64le_ UPLOAD_PACKAGES: 'True' @@ -36,6 +40,11 @@ jobs: export CI=azure export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then + export IS_PR_BUILD="True" + else + export IS_PR_BUILD="False" + fi .scripts/run_docker_build.sh displayName: Run docker build env: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 39baad3..84d4f42 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -23,6 +23,11 @@ jobs: export OSX_FORCE_SDK_DOWNLOAD="1" export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then + export IS_PR_BUILD="True" + else + export IS_PR_BUILD="False" + fi ./.scripts/run_osx_build.sh displayName: Run OSX build env: diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index b5a6aef..9af74ba 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index aa16472..9de29f3 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index a025e81..a987e8d 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -5,7 +5,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index af15091..0000000 --- a/.drone.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -kind: pipeline -name: linux_aarch64_ - -platform: - os: linux - arch: arm64 - -steps: -- name: Install and build - image: quay.io/condaforge/linux-anvil-aarch64 - environment: - CONFIG: linux_aarch64_ - UPLOAD_PACKAGES: True - PLATFORM: linux-aarch64 - BINSTAR_TOKEN: - from_secret: BINSTAR_TOKEN - FEEDSTOCK_TOKEN: - from_secret: FEEDSTOCK_TOKEN - STAGING_BINSTAR_TOKEN: - from_secret: STAGING_BINSTAR_TOKEN - commands: - - export FEEDSTOCK_ROOT="$DRONE_WORKSPACE" - - export RECIPE_ROOT="$FEEDSTOCK_ROOT/recipe" - - export CI=drone - - export GIT_BRANCH="$DRONE_BRANCH" - - export FEEDSTOCK_NAME=$(basename ${DRONE_REPO_NAME}) - - sed -i '$ichown -R conda:conda "$FEEDSTOCK_ROOT"' /opt/docker/bin/entrypoint - - /opt/docker/bin/entrypoint $FEEDSTOCK_ROOT/.scripts/build_steps.sh - - echo "Done building" - diff --git a/.gitattributes b/.gitattributes index 9060b27..ce52713 100644 --- a/.gitattributes +++ b/.gitattributes @@ -18,6 +18,7 @@ bld.bat text eol=crlf .gitignore linguist-generated=true .travis.yml linguist-generated=true .scripts/* linguist-generated=true +.woodpecker.yml linguist-generated=true LICENSE.txt linguist-generated=true README.md linguist-generated=true azure-pipelines.yml linguist-generated=true diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 99baf86..9008710 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -25,7 +25,8 @@ conda-build: root-dir: ${FEEDSTOCK_ROOT}/build_artifacts CONDARC -BUILD_CMD=build +GET_BOA=boa +BUILD_CMD=mambabuild conda install --yes --quiet "conda-forge-ci-setup=3" conda-build pip ${GET_BOA:-} -c conda-forge @@ -37,8 +38,8 @@ source run_conda_forge_build_setup # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" -if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${BUILD_WITH_CONDA_DEBUG:-0}" != 1 ]]; then - EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" +if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${HOST_PLATFORM}" != linux-* ]] && [[ "${BUILD_WITH_CONDA_DEBUG:-0}" != 1 ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi @@ -66,7 +67,7 @@ else ( startgroup "Uploading packages" ) 2> /dev/null - if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then + if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" fi diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 244ccd1..0c6515f 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -75,12 +75,15 @@ fi ( startgroup "Start Docker" ) 2> /dev/null export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" +export IS_PR_BUILD="${IS_PR_BUILD:-False}" +docker pull "${DOCKER_IMAGE}" docker run ${DOCKER_RUN_ARGS} \ -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z,delegated \ -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z,delegated \ -e CONFIG \ -e HOST_USER_ID \ -e UPLOAD_PACKAGES \ + -e IS_PR_BUILD \ -e GIT_BRANCH \ -e UPLOAD_ON_BRANCH \ -e CI \ @@ -91,9 +94,9 @@ docker run ${DOCKER_RUN_ARGS} \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ - $DOCKER_IMAGE \ + "${DOCKER_IMAGE}" \ bash \ - /home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh + "/home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh" # verify that the end of the script was reached test -f "$DONE_CANARY" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 708b1e1..3dca437 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -9,15 +9,17 @@ MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} ( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Miniforge3-MacOSX-x86_64.sh" +MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" +rm -rf ${MINIFORGE_HOME} bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} ( endgroup "Installing a fresh version of Miniforge" ) 2> /dev/null ( startgroup "Configuring conda" ) 2> /dev/null -BUILD_CMD=build +GET_BOA=boa +BUILD_CMD=mambabuild source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base @@ -66,7 +68,7 @@ validate_recipe_outputs "${FEEDSTOCK_NAME}" ( startgroup "Uploading packages" ) 2> /dev/null -if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then +if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml fi diff --git a/README.md b/README.md index 455f3c5..f0bb26c 100644 --- a/README.md +++ b/README.md @@ -13,14 +13,7 @@ Current build status ==================== - - - - +
Drone - - linux - -
@@ -109,7 +102,8 @@ conda search orc --channel conda-forge About conda-forge ================= -[![Powered by NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A)](http://numfocus.org) +[![Powered by +NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A)](https://numfocus.org) conda-forge is a community-led conda channel of installable packages. In order to provide high-quality builds, the process has been automated into the diff --git a/build-locally.py b/build-locally.py index 00eeb34..8b74348 100755 --- a/build-locally.py +++ b/build-locally.py @@ -13,6 +13,7 @@ def setup_environment(ns): os.environ["CONFIG"] = ns.config os.environ["UPLOAD_PACKAGES"] = "False" + os.environ["IS_PR_BUILD"] = "True" if ns.debug: os.environ["BUILD_WITH_CONDA_DEBUG"] = "1" if ns.output_id: @@ -21,6 +22,10 @@ def setup_environment(ns): os.environ["MINIFORGE_HOME"] = os.path.join( os.path.dirname(__file__), "miniforge3" ) + if "OSX_SDK_DIR" not in os.environ: + os.environ["OSX_SDK_DIR"] = os.path.join( + os.path.dirname(__file__), "SDKs" + ) def run_docker_build(ns): From e8a438bdb4aeb1885c28f4d1a3a7abcc2fde3583 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 9 Dec 2021 15:54:59 +0000 Subject: [PATCH 027/105] Rebuild for libprotobuf319 --- .ci_support/migrations/libprotobuf319.yaml | 7 +++++++ conda-forge.yml | 5 ++++- recipe/meta.yaml | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 .ci_support/migrations/libprotobuf319.yaml diff --git a/.ci_support/migrations/libprotobuf319.yaml b/.ci_support/migrations/libprotobuf319.yaml new file mode 100644 index 0000000..bafbe1f --- /dev/null +++ b/.ci_support/migrations/libprotobuf319.yaml @@ -0,0 +1,7 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +libprotobuf: +- '3.19' +migrator_ts: 1634806373.384677 diff --git a/conda-forge.yml b/conda-forge.yml index a7afddf..04c197b 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,6 +1,9 @@ build_platform: + linux_aarch64: linux_64 linux_ppc64le: linux_64 osx_arm64: osx_64 conda_forge_output_validation: true -provider: {linux_aarch64: default, linux_ppc64le: default} +provider: + linux_aarch64: default + linux_ppc64le: default test_on_native_only: true diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 904717e..bdd76e9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,7 +14,7 @@ source: - 0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch build: - number: 0 + number: 1 skip: true # [win] run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From d20afc98fcf3f7f279541f719684a8bc96443281 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 9 Dec 2021 15:55:16 +0000 Subject: [PATCH 028/105] MNT: Re-rendered with conda-build 3.21.7, conda-smithy 3.15.0, and conda-forge-pinning 2021.12.09.14.59.11 --- .azure-pipelines/azure-pipelines-linux.yml | 6 +++--- .ci_support/linux_64_.yaml | 6 ++---- .ci_support/linux_aarch64_.yaml | 4 ++-- .ci_support/linux_ppc64le_.yaml | 4 ++-- .ci_support/migrations/libprotobuf318.yaml | 7 ------- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- 7 files changed, 11 insertions(+), 20 deletions(-) delete mode 100644 .ci_support/migrations/libprotobuf318.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index b360190..3b9dee7 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -11,15 +11,15 @@ jobs: linux_64_: CONFIG: linux_64_ UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_: CONFIG: linux_aarch64_ UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_ppc64le_: CONFIG: linux_ppc64le_ UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 steps: diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 9af74ba..2405417 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -13,9 +13,9 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- '3.18' +- '3.19' lz4_c: - 1.9.3 pin_run_as_build: @@ -30,8 +30,6 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - cdt_name - - docker_image zlib: - '1.2' zstd: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 579aa0a..598b942 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -17,9 +17,9 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- '3.18' +- '3.19' lz4_c: - 1.9.3 pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 9de29f3..b73fab9 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -13,9 +13,9 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- '3.18' +- '3.19' lz4_c: - 1.9.3 pin_run_as_build: diff --git a/.ci_support/migrations/libprotobuf318.yaml b/.ci_support/migrations/libprotobuf318.yaml deleted file mode 100644 index 328967a..0000000 --- a/.ci_support/migrations/libprotobuf318.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libprotobuf: -- '3.18' -migrator_ts: 1631764220.7977521 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index a987e8d..6783320 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '11' libprotobuf: -- '3.18' +- '3.19' lz4_c: - 1.9.3 macos_machine: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 8a7348d..734f501 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '11' libprotobuf: -- '3.18' +- '3.19' lz4_c: - 1.9.3 macos_machine: From e7a188f2bd305e6505867785bdcea95b454cb05e Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Wed, 15 Dec 2021 15:19:02 +0000 Subject: [PATCH 029/105] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration CondaForgeGHAWithMain --- .github/workflows/automerge.yml | 3 ++- .github/workflows/webservices.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index e8e5902..773b3d1 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -13,6 +13,7 @@ jobs: uses: actions/checkout@v2 - name: automerge-action id: automerge-action - uses: conda-forge/automerge-action@master + uses: conda-forge/automerge-action@main with: github_token: ${{ secrets.GITHUB_TOKEN }} + rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/.github/workflows/webservices.yml b/.github/workflows/webservices.yml index 78f51e6..d6f06b5 100644 --- a/.github/workflows/webservices.yml +++ b/.github/workflows/webservices.yml @@ -7,6 +7,7 @@ jobs: steps: - name: webservices id: webservices - uses: conda-forge/webservices-dispatch-action@master + uses: conda-forge/webservices-dispatch-action@main with: github_token: ${{ secrets.GITHUB_TOKEN }} + rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} From 114b77a89b5f6d22d644a256845244c4990c66fc Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Fri, 17 Dec 2021 03:31:08 +0000 Subject: [PATCH 030/105] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration CondaForgeGHAWithMain --- .github/workflows/automerge.yml | 2 +- .github/workflows/webservices.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 773b3d1..f79fe85 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -13,7 +13,7 @@ jobs: uses: actions/checkout@v2 - name: automerge-action id: automerge-action - uses: conda-forge/automerge-action@main + uses: conda-forge/automerge-action@master with: github_token: ${{ secrets.GITHUB_TOKEN }} rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/.github/workflows/webservices.yml b/.github/workflows/webservices.yml index d6f06b5..2e5fe71 100644 --- a/.github/workflows/webservices.yml +++ b/.github/workflows/webservices.yml @@ -7,7 +7,7 @@ jobs: steps: - name: webservices id: webservices - uses: conda-forge/webservices-dispatch-action@main + uses: conda-forge/webservices-dispatch-action@master with: github_token: ${{ secrets.GITHUB_TOKEN }} rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} From ad7669d583d018173775372929792189886f3b4a Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 21 Dec 2021 05:27:44 +0000 Subject: [PATCH 031/105] updated v1.7.2 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bdd76e9..ebdcf84 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.7.1" %} +{% set version = "1.7.2" %} package: name: orc @@ -6,7 +6,7 @@ package: source: url: https://archive.apache.org/dist/orc/orc-{{ version }}/orc-{{ version }}.tar.gz - sha256: 65d71e571238cbcb7c3cbb9a10f7ad988f452d17c58479154be3b9d6ec27d005 + sha256: ef39bae755116fecb07fb4334656f984ba8ce7cdb1c64de078d3ed186b286007 patches: # ORC builds by default with -Werror but some dependencies omit warnings. # This deactivates -Werror @@ -14,7 +14,7 @@ source: - 0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch build: - number: 1 + number: 0 skip: true # [win] run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From 39700ef2833107de14440caba7c4677bbc7e6076 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 21 Dec 2021 05:28:05 +0000 Subject: [PATCH 032/105] MNT: Re-rendered with conda-build 3.21.7, conda-smithy 3.16.0, and conda-forge-pinning 2021.12.20.19.09.43 --- .scripts/build_steps.sh | 10 ++++++---- .scripts/run_osx_build.sh | 12 ++++++------ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 9008710..b3d5b81 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -5,6 +5,8 @@ # changes to this script, consider a proposal to conda-smithy so that other feedstocks can also # benefit from the improvement. +# -*- mode: jinja-shell -*- + set -xeuo pipefail export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}" source ${FEEDSTOCK_ROOT}/.scripts/logging_utils.sh @@ -25,10 +27,10 @@ conda-build: root-dir: ${FEEDSTOCK_ROOT}/build_artifacts CONDARC -GET_BOA=boa -BUILD_CMD=mambabuild -conda install --yes --quiet "conda-forge-ci-setup=3" conda-build pip ${GET_BOA:-} -c conda-forge + +mamba install --update-specs --yes --quiet "conda-forge-ci-setup=3" conda-build pip boa -c conda-forge +mamba update --update-specs --yes --quiet "conda-forge-ci-setup=3" conda-build pip boa -c conda-forge # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -56,7 +58,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda $BUILD_CMD "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" ( startgroup "Validating outputs" ) 2> /dev/null diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 3dca437..6774b01 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +# -*- mode: jinja-shell -*- + source .scripts/logging_utils.sh set -xe @@ -9,7 +11,7 @@ MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} ( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh" +MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" rm -rf ${MINIFORGE_HOME} bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} @@ -18,14 +20,12 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} ( startgroup "Configuring conda" ) 2> /dev/null -GET_BOA=boa -BUILD_CMD=mambabuild - source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base echo -e "\n\nInstalling conda-forge-ci-setup=3 and conda-build." -conda install -n base --quiet --yes "conda-forge-ci-setup=3" conda-build pip ${GET_BOA:-} +mamba install -n base --update-specs --quiet --yes "conda-forge-ci-setup=3" conda-build pip boa +mamba update -n base --update-specs --quiet --yes "conda-forge-ci-setup=3" conda-build pip boa @@ -59,7 +59,7 @@ if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi -conda $BUILD_CMD ./recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml ${EXTRA_CB_OPTIONS:-} +conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml ${EXTRA_CB_OPTIONS:-} ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" From a77fa87bd5e1c225df0250a4e239a5afae4f4280 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 10 Feb 2022 10:56:25 +0000 Subject: [PATCH 033/105] updated v1.7.3 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ebdcf84..43d6367 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.7.2" %} +{% set version = "1.7.3" %} package: name: orc @@ -6,7 +6,7 @@ package: source: url: https://archive.apache.org/dist/orc/orc-{{ version }}/orc-{{ version }}.tar.gz - sha256: ef39bae755116fecb07fb4334656f984ba8ce7cdb1c64de078d3ed186b286007 + sha256: 535c4d7588172e85b8fc941cd0575d67f2155a55e4cd65d87d5b194b0bb28a31 patches: # ORC builds by default with -Werror but some dependencies omit warnings. # This deactivates -Werror From d2b4efd5300d9f1de2de63e6c69ab8e5b6c0fc41 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 10 Feb 2022 10:56:46 +0000 Subject: [PATCH 034/105] MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.16.2, and conda-forge-pinning 2022.02.08.09.38.24 --- LICENSE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.txt b/LICENSE.txt index ed3f451..6ec1401 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,5 @@ BSD 3-clause license -Copyright (c) 2015-2021, conda-forge contributors +Copyright (c) 2015-2022, conda-forge contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: From 801168bb3bb751fbdea6e4cb57c815c9d2f460ff Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Sun, 13 Mar 2022 19:33:41 +0000 Subject: [PATCH 035/105] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** turning off CI for master to main migration --- .circleci/config.yml | 1 + azure-pipelines.yml => azure-pipelines.yml.bak | 0 2 files changed, 1 insertion(+) rename azure-pipelines.yml => azure-pipelines.yml.bak (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ad461b..cf397d5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,3 +1,4 @@ + # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- diff --git a/azure-pipelines.yml b/azure-pipelines.yml.bak similarity index 100% rename from azure-pipelines.yml rename to azure-pipelines.yml.bak From 4aabccccdddab0bfbffdccc14340ea547a4eb818 Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Sun, 13 Mar 2022 19:33:49 +0000 Subject: [PATCH 036/105] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** turning on CI for master to main migration --- .circleci/config.yml | 1 - azure-pipelines.yml.bak => azure-pipelines.yml | 0 2 files changed, 1 deletion(-) rename azure-pipelines.yml.bak => azure-pipelines.yml (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index cf397d5..6ad461b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,4 +1,3 @@ - # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- diff --git a/azure-pipelines.yml.bak b/azure-pipelines.yml similarity index 100% rename from azure-pipelines.yml.bak rename to azure-pipelines.yml From 3d7512dc7c54f379c6badab99c09c88c3f7ac611 Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Sun, 13 Mar 2022 19:33:50 +0000 Subject: [PATCH 037/105] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration CondaForgeMasterToMain --- .github/workflows/automerge.yml | 2 +- .github/workflows/webservices.yml | 2 +- conda-forge.yml | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index f79fe85..773b3d1 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -13,7 +13,7 @@ jobs: uses: actions/checkout@v2 - name: automerge-action id: automerge-action - uses: conda-forge/automerge-action@master + uses: conda-forge/automerge-action@main with: github_token: ${{ secrets.GITHUB_TOKEN }} rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/.github/workflows/webservices.yml b/.github/workflows/webservices.yml index 2e5fe71..d6f06b5 100644 --- a/.github/workflows/webservices.yml +++ b/.github/workflows/webservices.yml @@ -7,7 +7,7 @@ jobs: steps: - name: webservices id: webservices - uses: conda-forge/webservices-dispatch-action@master + uses: conda-forge/webservices-dispatch-action@main with: github_token: ${{ secrets.GITHUB_TOKEN }} rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/conda-forge.yml b/conda-forge.yml index 04c197b..9dd2d0c 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -7,3 +7,6 @@ provider: linux_aarch64: default linux_ppc64le: default test_on_native_only: true +github: + branch_name: main + tooling_branch_name: main From 6071c6d68a54b5b5fa70524f8f77f9109a0c4c82 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 9 Apr 2022 15:54:11 +0000 Subject: [PATCH 038/105] Rebuild for libprotobuf320 --- .ci_support/migrations/libprotobuf320.yaml | 7 +++++++ conda-forge.yml | 6 +++--- recipe/meta.yaml | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 .ci_support/migrations/libprotobuf320.yaml diff --git a/.ci_support/migrations/libprotobuf320.yaml b/.ci_support/migrations/libprotobuf320.yaml new file mode 100644 index 0000000..169106d --- /dev/null +++ b/.ci_support/migrations/libprotobuf320.yaml @@ -0,0 +1,7 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +libprotobuf: +- '3.20' +migrator_ts: 1648312994.8337886 diff --git a/conda-forge.yml b/conda-forge.yml index 9dd2d0c..5e66c8b 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -3,10 +3,10 @@ build_platform: linux_ppc64le: linux_64 osx_arm64: osx_64 conda_forge_output_validation: true +github: + branch_name: main + tooling_branch_name: main provider: linux_aarch64: default linux_ppc64le: default test_on_native_only: true -github: - branch_name: main - tooling_branch_name: main diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 43d6367..831cbaa 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,7 +14,7 @@ source: - 0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch build: - number: 0 + number: 1 skip: true # [win] run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From 0ea0bafb64b8b6976de2196fd0bbcca0a4325f14 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 9 Apr 2022 15:54:41 +0000 Subject: [PATCH 039/105] MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.19.0, and conda-forge-pinning 2022.04.09.06.52.04 --- .ci_support/README | 7 +++- .ci_support/linux_64_.yaml | 6 +-- .ci_support/linux_aarch64_.yaml | 6 +-- .ci_support/linux_ppc64le_.yaml | 6 +-- .ci_support/osx_64_.yaml | 6 +-- .ci_support/osx_arm64_.yaml | 6 +-- .gitattributes | 1 + .scripts/build_steps.sh | 6 ++- .scripts/run_docker_build.sh | 2 +- .scripts/run_osx_build.sh | 42 ++++++++++++++------- README.md | 65 +++++++++++++++++++++++---------- build-locally.py | 11 ++---- 12 files changed, 106 insertions(+), 58 deletions(-) diff --git a/.ci_support/README b/.ci_support/README index e4e2dce..a47316b 100644 --- a/.ci_support/README +++ b/.ci_support/README @@ -1 +1,6 @@ -This file is automatically generated by conda-smithy. To change any matrix elements, you should change conda-smithy's input conda_build_config.yaml and re-render the recipe, rather than editing these files directly. \ No newline at end of file +This file is automatically generated by conda-smithy. If any +particular build configuration is expected, but it is not found, +please make sure all dependencies are satisfiable. To add/modify any +matrix elements, you should create/change conda-smithy's input +recipe/conda_build_config.yaml and re-render the recipe, rather than +editing these files directly. diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 2405417..adfa3f8 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos6 channel_sources: @@ -11,11 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- '3.19' +- '3.20' lz4_c: - 1.9.3 pin_run_as_build: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 598b942..1c263c3 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_arch: - aarch64 cdt_name: @@ -15,11 +15,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- '3.19' +- '3.20' lz4_c: - 1.9.3 pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index b73fab9..e39db7d 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos7 channel_sources: @@ -11,11 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- '3.19' +- '3.20' lz4_c: - 1.9.3 pin_run_as_build: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 6783320..4cade5a 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '11' +- '12' channel_sources: - conda-forge channel_targets: @@ -11,9 +11,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '11' +- '12' libprotobuf: -- '3.19' +- '3.20' lz4_c: - 1.9.3 macos_machine: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 734f501..a2e6ec4 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '11' +- '12' channel_sources: - conda-forge channel_targets: @@ -11,9 +11,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '11' +- '12' libprotobuf: -- '3.19' +- '3.20' lz4_c: - 1.9.3 macos_machine: diff --git a/.gitattributes b/.gitattributes index ce52713..7f32763 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,6 +9,7 @@ bld.bat text eol=crlf # github helper pieces to make some files not show up in diffs automatically .azure-pipelines/* linguist-generated=true .circleci/* linguist-generated=true +.ci_support/README linguist-generated=true .drone/* linguist-generated=true .drone.yml linguist-generated=true .github/* linguist-generated=true diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index b3d5b81..c6b23e8 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -29,8 +29,10 @@ conda-build: CONDARC -mamba install --update-specs --yes --quiet "conda-forge-ci-setup=3" conda-build pip boa -c conda-forge -mamba update --update-specs --yes --quiet "conda-forge-ci-setup=3" conda-build pip boa -c conda-forge +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 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 0c6515f..9236239 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -14,7 +14,7 @@ set -xeo pipefail THISDIR="$( cd "$( dirname "$0" )" >/dev/null && pwd )" PROVIDER_DIR="$(basename $THISDIR)" -FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) +FEEDSTOCK_ROOT="$( cd "$( dirname "$0" )/.." >/dev/null && pwd )" RECIPE_ROOT="${FEEDSTOCK_ROOT}/recipe" if [ -z ${FEEDSTOCK_NAME} ]; then diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 6774b01..3d85505 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,9 +23,11 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -echo -e "\n\nInstalling conda-forge-ci-setup=3 and conda-build." -mamba install -n base --update-specs --quiet --yes "conda-forge-ci-setup=3" conda-build pip boa -mamba update -n base --update-specs --quiet --yes "conda-forge-ci-setup=3" conda-build pip boa +echo -e "\n\nInstalling ['conda-forge-ci-setup=3'] and conda-build." +mamba install --update-specs --quiet --yes --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 @@ -51,7 +53,6 @@ source run_conda_forge_build_setup ( endgroup "Configuring conda" ) 2> /dev/null - echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml @@ -59,17 +60,32 @@ if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi -conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml ${EXTRA_CB_OPTIONS:-} -( startgroup "Validating outputs" ) 2> /dev/null -validate_recipe_outputs "${FEEDSTOCK_NAME}" +if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then + if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" + fi + conda debug ./recipe -m ./.ci_support/${CONFIG}.yaml \ + ${EXTRA_CB_OPTIONS:-} \ + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml -( endgroup "Validating outputs" ) 2> /dev/null + # Drop into an interactive shell + /bin/bash +else + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + --suppress-variables ${EXTRA_CB_OPTIONS:-} \ + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + ( startgroup "Validating outputs" ) 2> /dev/null -( startgroup "Uploading packages" ) 2> /dev/null + validate_recipe_outputs "${FEEDSTOCK_NAME}" -if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then - upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml -fi + ( endgroup "Validating outputs" ) 2> /dev/null + + ( startgroup "Uploading packages" ) 2> /dev/null + + if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then + upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml + fi -( endgroup "Uploading packages" ) 2> /dev/null \ No newline at end of file + ( endgroup "Uploading packages" ) 2> /dev/null +fi \ No newline at end of file diff --git a/README.md b/README.md index f0bb26c..755cdcc 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Home: http://github.com/apache/orc Package license: Apache-2.0 -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/orc-feedstock/blob/master/LICENSE.txt) +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/orc-feedstock/blob/main/LICENSE.txt) Summary: C++ libraries for Apache ORC @@ -20,8 +20,8 @@ Current build status
Azure
- - + + @@ -29,36 +29,36 @@ Current build status @@ -86,18 +86,43 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `orc` can be installed with: +Once the `conda-forge` channel has been enabled, `orc` can be installed with `conda`: ``` conda install orc ``` -It is possible to list all of the versions of `orc` available on your platform with: +or with `mamba`: + +``` +mamba install orc +``` + +It is possible to list all of the versions of `orc` available on your platform with `conda`: ``` conda search orc --channel conda-forge ``` +or with `mamba`: + +``` +mamba search orc --channel conda-forge +``` + +Alternatively, `mamba repoquery` may provide more information: + +``` +# Search all versions available on your platform: +mamba repoquery search orc --channel conda-forge + +# List packages depending on `orc`: +mamba repoquery whoneeds orc --channel conda-forge + +# List dependencies of `orc`: +mamba repoquery depends orc --channel conda-forge +``` + About conda-forge ================= @@ -113,10 +138,12 @@ for each of the installable packages. Such a repository is known as a *feedstock A feedstock is made up of a conda recipe (the instructions on what and how to build the package) and the necessary configurations for automatic building using freely available continuous integration services. Thanks to the awesome service provided by -[CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/) -and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable -packages to the [conda-forge](https://anaconda.org/conda-forge) -[Anaconda-Cloud](https://anaconda.org/) channel for Linux, Windows and OSX respectively. +[Azure](https://azure.microsoft.com/en-us/services/devops/), [GitHub](https://github.com/), +[CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/), +[Drone](https://cloud.drone.io/welcome), and [TravisCI](https://travis-ci.com/) +it is possible to build and upload installable packages to the +[conda-forge](https://anaconda.org/conda-forge) [Anaconda-Cloud](https://anaconda.org/) +channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance [conda-smithy](https://github.com/conda-forge/conda-smithy) has been developed. diff --git a/build-locally.py b/build-locally.py index 8b74348..eec38a0 100755 --- a/build-locally.py +++ b/build-locally.py @@ -22,10 +22,6 @@ def setup_environment(ns): os.environ["MINIFORGE_HOME"] = os.path.join( os.path.dirname(__file__), "miniforge3" ) - if "OSX_SDK_DIR" not in os.environ: - os.environ["OSX_SDK_DIR"] = os.path.join( - os.path.dirname(__file__), "SDKs" - ) def run_docker_build(ns): @@ -65,11 +61,12 @@ def verify_config(ns): raise ValueError( f"only Linux/macOS configs currently supported, got {ns.config}" ) - elif ns.config.startswith("osx") and platform.system() == "Darwin": + elif ns.config.startswith("osx"): 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'" + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " + "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) From bf3a624bcdf66f077659c17a425f1d9407168bf8 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 16 Apr 2022 03:29:34 +0000 Subject: [PATCH 040/105] updated v1.7.4 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 831cbaa..00e7df0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.7.3" %} +{% set version = "1.7.4" %} package: name: orc @@ -6,7 +6,7 @@ package: source: url: https://archive.apache.org/dist/orc/orc-{{ version }}/orc-{{ version }}.tar.gz - sha256: 535c4d7588172e85b8fc941cd0575d67f2155a55e4cd65d87d5b194b0bb28a31 + sha256: 0a70c5e877b1ff268e768c94392574a084092f8aa7f97796c13de276103d8272 patches: # ORC builds by default with -Werror but some dependencies omit warnings. # This deactivates -Werror @@ -14,7 +14,7 @@ source: - 0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch build: - number: 1 + number: 0 skip: true # [win] run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From 3ecfba2228a55305cb4ff25b398e2792cc770711 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 18 May 2022 03:49:25 +0000 Subject: [PATCH 041/105] Rebuild for lz4_c19 --- .ci_support/migrations/lz4_c19.yaml | 8 ++++++++ recipe/meta.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/lz4_c19.yaml diff --git a/.ci_support/migrations/lz4_c19.yaml b/.ci_support/migrations/lz4_c19.yaml new file mode 100644 index 0000000..41dd285 --- /dev/null +++ b/.ci_support/migrations/lz4_c19.yaml @@ -0,0 +1,8 @@ +migrator_ts: 1652241058 +__migrator: + kind: version + migration_number: 1 + bump_number: 1 + +lz4_c: + - '1.9.3' diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 00e7df0..931240f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,7 +14,7 @@ source: - 0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch build: - number: 0 + number: 1 skip: true # [win] run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From ea979c136b5d1d86c172f2dea4fcef2ea235fce3 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 18 May 2022 03:49:48 +0000 Subject: [PATCH 042/105] MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.19.0, and conda-forge-pinning 2022.05.17.21.59.01 --- .ci_support/linux_64_.yaml | 2 -- .ci_support/linux_aarch64_.yaml | 2 -- .ci_support/linux_ppc64le_.yaml | 2 -- .ci_support/migrations/libprotobuf319.yaml | 7 ------- .ci_support/osx_64_.yaml | 6 ++---- .ci_support/osx_arm64_.yaml | 6 ++---- 6 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 .ci_support/migrations/libprotobuf319.yaml diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index adfa3f8..32c93e3 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -19,8 +19,6 @@ libprotobuf: lz4_c: - 1.9.3 pin_run_as_build: - lz4-c: - max_pin: x.x.x zlib: max_pin: x.x snappy: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 1c263c3..333635f 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -23,8 +23,6 @@ libprotobuf: lz4_c: - 1.9.3 pin_run_as_build: - lz4-c: - max_pin: x.x.x zlib: max_pin: x.x snappy: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index e39db7d..23d35b0 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -19,8 +19,6 @@ libprotobuf: lz4_c: - 1.9.3 pin_run_as_build: - lz4-c: - max_pin: x.x.x zlib: max_pin: x.x snappy: diff --git a/.ci_support/migrations/libprotobuf319.yaml b/.ci_support/migrations/libprotobuf319.yaml deleted file mode 100644 index bafbe1f..0000000 --- a/.ci_support/migrations/libprotobuf319.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libprotobuf: -- '3.19' -migrator_ts: 1634806373.384677 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 4cade5a..6619435 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '12' +- '13' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '12' +- '13' libprotobuf: - '3.20' lz4_c: @@ -19,8 +19,6 @@ lz4_c: macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: - lz4-c: - max_pin: x.x.x zlib: max_pin: x.x snappy: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index a2e6ec4..3821cc4 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '12' +- '13' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '12' +- '13' libprotobuf: - '3.20' lz4_c: @@ -19,8 +19,6 @@ lz4_c: macos_machine: - arm64-apple-darwin20.0.0 pin_run_as_build: - lz4-c: - max_pin: x.x.x zlib: max_pin: x.x snappy: From 624d6cc790de10449aafa4427552499123d997fd Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 17 Jun 2022 21:38:20 +0000 Subject: [PATCH 043/105] updated v1.7.5 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 931240f..17ed41a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.7.4" %} +{% set version = "1.7.5" %} package: name: orc @@ -6,7 +6,7 @@ package: source: url: https://archive.apache.org/dist/orc/orc-{{ version }}/orc-{{ version }}.tar.gz - sha256: 0a70c5e877b1ff268e768c94392574a084092f8aa7f97796c13de276103d8272 + sha256: b90cae5853e3ea0e5bf64e3883d09d871ec280536e0bb2cc52d08f79f0be0010 patches: # ORC builds by default with -Werror but some dependencies omit warnings. # This deactivates -Werror @@ -14,7 +14,7 @@ source: - 0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch build: - number: 1 + number: 0 skip: true # [win] run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From 03ced483c4ed07edc3115b8ec6e750ae8216de0d Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 17 Jun 2022 21:38:46 +0000 Subject: [PATCH 044/105] MNT: Re-rendered with conda-build 3.21.9, conda-smithy 3.20.0, and conda-forge-pinning 2022.06.17.10.28.32 --- .ci_support/migrations/lz4_c19.yaml | 8 -------- .circleci/config.yml | 3 ++- 2 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 .ci_support/migrations/lz4_c19.yaml diff --git a/.ci_support/migrations/lz4_c19.yaml b/.ci_support/migrations/lz4_c19.yaml deleted file mode 100644 index 41dd285..0000000 --- a/.ci_support/migrations/lz4_c19.yaml +++ /dev/null @@ -1,8 +0,0 @@ -migrator_ts: 1652241058 -__migrator: - kind: version - migration_number: 1 - bump_number: 1 - -lz4_c: - - '1.9.3' diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ad461b..3e61aa2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,8 @@ version: 2 jobs: build: working_directory: ~/test - machine: true + machine: + image: ubuntu-2004:current steps: - run: # The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish. From 2255448b67b7122ae97c2d79f3cbdd733f1fbe47 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 18 Aug 2022 09:13:49 +0000 Subject: [PATCH 045/105] updated v1.7.6 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 17ed41a..fa4da09 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.7.5" %} +{% set version = "1.7.6" %} package: name: orc @@ -6,7 +6,7 @@ package: source: url: https://archive.apache.org/dist/orc/orc-{{ version }}/orc-{{ version }}.tar.gz - sha256: b90cae5853e3ea0e5bf64e3883d09d871ec280536e0bb2cc52d08f79f0be0010 + sha256: a75e0cccaaf5e03f1699bb804f640246bec4d134cb57957125707b0b2822160d patches: # ORC builds by default with -Werror but some dependencies omit warnings. # This deactivates -Werror From 5046065b8d8060095824d854af2aad4c8062377e Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 18 Aug 2022 09:14:08 +0000 Subject: [PATCH 046/105] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and conda-forge-pinning 2022.08.17.15.27.08 --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- .ci_support/migrations/libprotobuf320.yaml | 7 ----- .scripts/build_steps.sh | 9 ++++++- .scripts/run_osx_build.sh | 4 +++ LICENSE.txt | 30 ++++++++++++++++------ build-locally.py | 19 +++++++++----- 6 files changed, 48 insertions(+), 23 deletions(-) delete mode 100644 .ci_support/migrations/libprotobuf320.yaml diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 84d4f42..8032e96 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-10.15 + vmImage: macOS-11 strategy: matrix: osx_64_: diff --git a/.ci_support/migrations/libprotobuf320.yaml b/.ci_support/migrations/libprotobuf320.yaml deleted file mode 100644 index 169106d..0000000 --- a/.ci_support/migrations/libprotobuf320.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libprotobuf: -- '3.20' -migrator_ts: 1648312994.8337886 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index c6b23e8..a6b09f6 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -24,7 +24,10 @@ export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" cat >~/.condarc < /dev/null +if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then + cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" +fi + if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 3d85505..736a39a 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -61,6 +61,10 @@ if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then fi +if [[ -f LICENSE.txt ]]; then + cp LICENSE.txt "recipe/recipe-scripts-license.txt" +fi + if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" diff --git a/LICENSE.txt b/LICENSE.txt index 6ec1401..2ec51d7 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,13 +1,27 @@ -BSD 3-clause license +BSD-3-Clause license Copyright (c) 2015-2022, conda-forge contributors All rights reserved. -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: -1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. -2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. diff --git a/build-locally.py b/build-locally.py index eec38a0..3f4b7a7 100755 --- a/build-locally.py +++ b/build-locally.py @@ -86,12 +86,19 @@ def main(args=None): verify_config(ns) setup_environment(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) + try: + 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) + finally: + recipe_license_file = os.path.join( + "recipe", "recipe-scripts-license.txt" + ) + if os.path.exists(recipe_license_file): + os.remove(recipe_license_file) if __name__ == "__main__": From c4dbc08c61e3092d9f80322126df160258c569a4 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 27 Aug 2022 21:43:31 +0000 Subject: [PATCH 047/105] Rebuild for libprotobuf321 --- .ci_support/migrations/libprotobuf321.yaml | 7 +++++++ recipe/meta.yaml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libprotobuf321.yaml diff --git a/.ci_support/migrations/libprotobuf321.yaml b/.ci_support/migrations/libprotobuf321.yaml new file mode 100644 index 0000000..41701fa --- /dev/null +++ b/.ci_support/migrations/libprotobuf321.yaml @@ -0,0 +1,7 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +libprotobuf: +- '3.21' +migrator_ts: 1661531047.2553904 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index fa4da09..79556af 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,7 +14,7 @@ source: - 0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch build: - number: 0 + number: 1 skip: true # [win] run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From fcea238acb01d3572298b836db4bbe797c2ad910 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 27 Aug 2022 21:43:53 +0000 Subject: [PATCH 048/105] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and conda-forge-pinning 2022.08.27.13.34.34 --- .ci_support/linux_64_.yaml | 2 +- .ci_support/linux_aarch64_.yaml | 2 +- .ci_support/linux_ppc64le_.yaml | 2 +- .ci_support/osx_64_.yaml | 6 +++--- .ci_support/osx_arm64_.yaml | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 32c93e3..76fdc55 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- '3.20' +- '3.21' lz4_c: - 1.9.3 pin_run_as_build: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 333635f..75f29d8 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -19,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- '3.20' +- '3.21' lz4_c: - 1.9.3 pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 23d35b0..81bb558 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- '3.20' +- '3.21' lz4_c: - 1.9.3 pin_run_as_build: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 6619435..5400ffe 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '13' +- '14' channel_sources: - conda-forge channel_targets: @@ -11,9 +11,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '13' +- '14' libprotobuf: -- '3.20' +- '3.21' lz4_c: - 1.9.3 macos_machine: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 3821cc4..0cd5c62 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '13' +- '14' channel_sources: - conda-forge channel_targets: @@ -11,9 +11,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '13' +- '14' libprotobuf: -- '3.20' +- '3.21' lz4_c: - 1.9.3 macos_machine: From 0d3bec1194f6dea871165f6e8303081315114342 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sun, 4 Sep 2022 04:11:36 +0000 Subject: [PATCH 049/105] updated v1.8.0 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 79556af..eb2a513 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.7.6" %} +{% set version = "1.8.0" %} package: name: orc @@ -6,7 +6,7 @@ package: source: url: https://archive.apache.org/dist/orc/orc-{{ version }}/orc-{{ version }}.tar.gz - sha256: a75e0cccaaf5e03f1699bb804f640246bec4d134cb57957125707b0b2822160d + sha256: 859d78bfded98405c32ccb2847b565a57bcc53f473a74087c1f750aeb5932e62 patches: # ORC builds by default with -Werror but some dependencies omit warnings. # This deactivates -Werror @@ -14,7 +14,7 @@ source: - 0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch build: - number: 1 + number: 0 skip: true # [win] run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From 464dbe649fbd64bbc5eb5bba20b2aba6c9e9519d Mon Sep 17 00:00:00 2001 From: "conda-forge-curator[bot]" <79913779+conda-forge-curator[bot]@users.noreply.github.com> Date: Wed, 2 Nov 2022 20:13:32 +0000 Subject: [PATCH 050/105] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration CondaForgeAutomergeUpdate --- .github/workflows/automerge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 773b3d1..da1368a 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -10,7 +10,7 @@ jobs: name: automerge steps: - name: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: automerge-action id: automerge-action uses: conda-forge/automerge-action@main From eee73d56605888138da462bdba3d65c8c9b5b11d Mon Sep 17 00:00:00 2001 From: "conda-forge-curator[bot]" <79913779+conda-forge-curator[bot]@users.noreply.github.com> Date: Thu, 17 Nov 2022 23:33:25 +0000 Subject: [PATCH 051/105] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration DotConda --- conda-forge.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda-forge.yml b/conda-forge.yml index 5e66c8b..c371034 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -10,3 +10,5 @@ provider: linux_aarch64: default linux_ppc64le: default test_on_native_only: true +conda_build: + pkg_format: '2' From 69a42188d63abfae81c669f83c8a5ffc6ee99ad2 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 3 Dec 2022 05:01:12 +0000 Subject: [PATCH 052/105] updated v1.8.1 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index eb2a513..91278be 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.8.0" %} +{% set version = "1.8.1" %} package: name: orc @@ -6,7 +6,7 @@ package: source: url: https://archive.apache.org/dist/orc/orc-{{ version }}/orc-{{ version }}.tar.gz - sha256: 859d78bfded98405c32ccb2847b565a57bcc53f473a74087c1f750aeb5932e62 + sha256: ba5877bd737e1fbc69822d3861b8e84854640bf2439b7ddad536d6303dd3638d patches: # ORC builds by default with -Werror but some dependencies omit warnings. # This deactivates -Werror From 75c4923f831ff6704140f0ab84eb15f4e942e96e Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 3 Dec 2022 05:01:25 +0000 Subject: [PATCH 053/105] MNT: Re-rendered with conda-build 3.23.2, conda-smithy 3.22.0, and conda-forge-pinning 2022.12.02.15.22.41 --- .ci_support/linux_64_.yaml | 3 --- .ci_support/linux_aarch64_.yaml | 3 --- .ci_support/linux_ppc64le_.yaml | 3 --- .ci_support/migrations/libprotobuf321.yaml | 7 ------- .ci_support/osx_64_.yaml | 3 --- .ci_support/osx_arm64_.yaml | 3 --- .circleci/config.yml | 2 +- .scripts/build_steps.sh | 4 ++-- .scripts/run_osx_build.sh | 5 ++--- README.md | 10 +++++----- 10 files changed, 10 insertions(+), 33 deletions(-) delete mode 100644 .ci_support/migrations/libprotobuf321.yaml diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 76fdc55..93fe3f2 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -18,9 +18,6 @@ libprotobuf: - '3.21' lz4_c: - 1.9.3 -pin_run_as_build: - zlib: - max_pin: x.x snappy: - '1' target_platform: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 75f29d8..b96cdd4 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -22,9 +22,6 @@ libprotobuf: - '3.21' lz4_c: - 1.9.3 -pin_run_as_build: - zlib: - max_pin: x.x snappy: - '1' target_platform: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 81bb558..ef40cbe 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -18,9 +18,6 @@ libprotobuf: - '3.21' lz4_c: - 1.9.3 -pin_run_as_build: - zlib: - max_pin: x.x snappy: - '1' target_platform: diff --git a/.ci_support/migrations/libprotobuf321.yaml b/.ci_support/migrations/libprotobuf321.yaml deleted file mode 100644 index 41701fa..0000000 --- a/.ci_support/migrations/libprotobuf321.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libprotobuf: -- '3.21' -migrator_ts: 1661531047.2553904 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 5400ffe..c786c11 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -18,9 +18,6 @@ lz4_c: - 1.9.3 macos_machine: - x86_64-apple-darwin13.4.0 -pin_run_as_build: - zlib: - max_pin: x.x snappy: - '1' target_platform: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 0cd5c62..4a9f719 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -18,9 +18,6 @@ lz4_c: - 1.9.3 macos_machine: - arm64-apple-darwin20.0.0 -pin_run_as_build: - zlib: - max_pin: x.x snappy: - '1' target_platform: diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e61aa2..8b4ef2f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- +# -*- mode: jinja-yaml -*- version: 2 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a6b09f6..84431a6 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,9 +33,9 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 736a39a..b3abaeb 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,11 +23,10 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -echo -e "\n\nInstalling ['conda-forge-ci-setup=3'] and conda-build." mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" diff --git a/README.md b/README.md index 755cdcc..13bae92 100644 --- a/README.md +++ b/README.md @@ -30,35 +30,35 @@ Current build status From c66772bda26b07c2cf5f3791ff985a1b49b09915 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 20:36:49 +0000 Subject: [PATCH 054/105] MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.22.1, and conda-forge-pinning 2022.12.07.18.34.25 --- .ci_support/linux_64_.yaml | 4 ++-- .ci_support/linux_aarch64_.yaml | 4 ++-- .ci_support/linux_ppc64le_.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 93fe3f2..baec626 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos6 channel_sources: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index b96cdd4..51ca5e1 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_arch: - aarch64 cdt_name: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index ef40cbe..8f65022 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos7 channel_sources: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: From 0ebc3c969f44f8662967bec8c39339e78d68ee13 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 14 Jan 2023 00:30:09 +0000 Subject: [PATCH 055/105] updated v1.8.2 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 91278be..f51094a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.8.1" %} +{% set version = "1.8.2" %} package: name: orc @@ -6,7 +6,7 @@ package: source: url: https://archive.apache.org/dist/orc/orc-{{ version }}/orc-{{ version }}.tar.gz - sha256: ba5877bd737e1fbc69822d3861b8e84854640bf2439b7ddad536d6303dd3638d + sha256: 5e14501212abcb739ab0f3bdedf230c47e5138d9bf9f0e89e9a84b18bd084052 patches: # ORC builds by default with -Werror but some dependencies omit warnings. # This deactivates -Werror From 9fc0226a53d3c315050353645f4890cb79ae4ce8 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Mon, 30 Jan 2023 23:44:08 +0000 Subject: [PATCH 056/105] Enable Windows Build --- ...-more-hints-for-libraries-on-Windows.patch | 48 +++++++++++++++++++ recipe/bld.bat | 23 +++++++++ recipe/meta.yaml | 4 +- 3 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 recipe/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch create mode 100644 recipe/bld.bat diff --git a/recipe/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch b/recipe/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch new file mode 100644 index 0000000..fbde40f --- /dev/null +++ b/recipe/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch @@ -0,0 +1,48 @@ +From f45ae86fbcd645fb69808f1d373cd0151e5230cc Mon Sep 17 00:00:00 2001 +From: Nehal J Wani +Date: Sat, 4 Feb 2023 20:50:40 +0000 +Subject: [PATCH 3/3] CMake: Add more hints for libraries on Windows + +--- + cmake_modules/FindLZ4.cmake | 2 +- + cmake_modules/FindProtobuf.cmake | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/cmake_modules/FindLZ4.cmake b/cmake_modules/FindLZ4.cmake +index f57984940..c466745e6 100644 +--- a/cmake_modules/FindLZ4.cmake ++++ b/cmake_modules/FindLZ4.cmake +@@ -28,7 +28,7 @@ find_path (LZ4_INCLUDE_DIR lz4.h HINTS + NO_DEFAULT_PATH + PATH_SUFFIXES "include") + +-find_library (LZ4_LIBRARY NAMES lz4 HINTS ++find_library (LZ4_LIBRARY NAMES lz4 liblz4 HINTS + ${_lz4_path} + PATH_SUFFIXES "lib" "lib64") + +diff --git a/cmake_modules/FindProtobuf.cmake b/cmake_modules/FindProtobuf.cmake +index f2b6a7ca9..6f32e58f7 100644 +--- a/cmake_modules/FindProtobuf.cmake ++++ b/cmake_modules/FindProtobuf.cmake +@@ -37,7 +37,7 @@ find_path (PROTOBUF_INCLUDE_DIR google/protobuf/io/coded_stream.h HINTS + NO_DEFAULT_PATH + PATH_SUFFIXES "include") + +-find_library (PROTOBUF_LIBRARY NAMES protobuf HINTS ++find_library (PROTOBUF_LIBRARY NAMES protobuf libprotobuf HINTS + ${_protobuf_path} + PATH_SUFFIXES "lib") + +@@ -45,7 +45,7 @@ find_library (PROTOBUF_STATIC_LIB NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}protobuf${ + ${_protobuf_path} + PATH_SUFFIXES "lib") + +-find_library (PROTOC_LIBRARY NAMES protoc HINTS ++find_library (PROTOC_LIBRARY NAMES protoc libprotoc HINTS + ${_protobuf_path} + PATH_SUFFIXES "lib") + +-- +2.33.1 + diff --git a/recipe/bld.bat b/recipe/bld.bat new file mode 100644 index 0000000..ab8e7e9 --- /dev/null +++ b/recipe/bld.bat @@ -0,0 +1,23 @@ +cmake -S %SRC_DIR% -Bbuild ^ + -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^ + -DCMAKE_BUILD_TYPE=Release ^ + -DBUILD_SHARED_LIBS=ON ^ + -DBUILD_JAVA=False ^ + -DLZ4_HOME=%LIBRARY_PREFIX% ^ + -DZLIB_HOME=%LIBRARY_PREFIX% ^ + -DZSTD_HOME=%LIBRARY_PREFIX% ^ + -DCMAKE_POLICY_DEFAULT_CMP0074=NEW ^ + -DProtobuf_ROOT=%LIBRARY_PREFIX% ^ + -DPROTOBUF_HOME=%LIBRARY_PREFIX% ^ + -DPROTOBUF_EXECUTABLE=%BUILD_PREFIX%\Library\bin\protoc.exe ^ + -DSNAPPY_HOME=%LIBRARY_PREFIX% ^ + -DBUILD_LIBHDFSPP=NO ^ + -DBUILD_CPP_TESTS=OFF ^ + -DBUILD_TOOLS=OFF ^ + -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^ + -DCMAKE_CXX_FLAGS="%CMAKE_CXX_FLAGS% /DPROTOBUF_USE_DLLS" ^ + -GNinja +if ERRORLEVEL 1 EXIT 1 + +cmake --build build --target install +if ERRORLEVEL 1 EXIT 1 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f51094a..da697d6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,10 +12,10 @@ source: # This deactivates -Werror - 0001-Deactivate-aggressive-failures-on-warnings.patch - 0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch + - 0003-CMake-Add-more-hints-for-libraries-on-Windows.patch build: - number: 0 - skip: true # [win] + number: 1 run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From a3916ef18e00a8db96961f61ff167251691613d0 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Mon, 30 Jan 2023 23:45:28 +0000 Subject: [PATCH 057/105] MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.22.1, and conda-forge-pinning 2023.01.30.13.41.09 --- .azure-pipelines/azure-pipelines-win.yml | 86 ++++++++++++++++++++++++ .ci_support/win_64_.yaml | 20 ++++++ README.md | 7 ++ azure-pipelines.yml | 1 + 4 files changed, 114 insertions(+) create mode 100755 .azure-pipelines/azure-pipelines-win.yml create mode 100644 .ci_support/win_64_.yaml diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml new file mode 100755 index 0000000..a192c0b --- /dev/null +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -0,0 +1,86 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + +jobs: +- job: win + pool: + vmImage: windows-2019 + strategy: + matrix: + win_64_: + CONFIG: win_64_ + UPLOAD_PACKAGES: 'True' + timeoutInMinutes: 360 + variables: + CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_TEMP: D:\\tmp + + steps: + - task: PythonScript@0 + displayName: 'Download Miniforge' + inputs: + scriptSource: inline + script: | + import urllib.request + url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' + path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" + urllib.request.urlretrieve(url, path) + + - script: | + start /wait "" %BUILD_ARTIFACTSTAGINGDIRECTORY%\Miniforge.exe /InstallationType=JustMe /RegisterPython=0 /S /D=C:\Miniforge + displayName: Install Miniforge + + - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" + displayName: Add conda to PATH + + - script: | + call activate base + mamba.exe install "python=3.9" conda-build conda pip boa conda-forge-ci-setup=3 "py-lief<0.12" -c conda-forge --strict-channel-priority --yes + displayName: Install conda-build + + - script: set PYTHONUNBUFFERED=1 + displayName: Set PYTHONUNBUFFERED + + # Configure the VM + - script: | + call activate base + setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml + displayName: conda-forge CI setup + + # Configure the VM. + - script: | + set "CI=azure" + call activate base + run_conda_forge_build_setup + displayName: conda-forge build setup + + - script: | + call activate base + if EXIST LICENSE.txt ( + copy LICENSE.txt "recipe\\recipe-scripts-license.txt" + ) + conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables + displayName: Build recipe + env: + PYTHONUNBUFFERED: 1 + - script: | + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + call activate base + validate_recipe_outputs "%FEEDSTOCK_NAME%" + displayName: Validate Recipe Outputs + + - script: | + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "TEMP=$(UPLOAD_TEMP)" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" + call activate base + upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml + displayName: Upload package + env: + BINSTAR_TOKEN: $(BINSTAR_TOKEN) + FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) + condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False')), not(eq(variables['Build.Reason'], 'PullRequest'))) \ No newline at end of file diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml new file mode 100644 index 0000000..ed48806 --- /dev/null +++ b/.ci_support/win_64_.yaml @@ -0,0 +1,20 @@ +c_compiler: +- vs2019 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +libprotobuf: +- '3.21' +lz4_c: +- 1.9.3 +snappy: +- '1' +target_platform: +- win-64 +zlib: +- '1.2' +zstd: +- '1.5' diff --git a/README.md b/README.md index 13bae92..334ef86 100644 --- a/README.md +++ b/README.md @@ -61,6 +61,13 @@ Current build status variant + + +
linux_64 - - variant + + variant
linux_aarch64 - - variant + + variant
linux_ppc64le - - variant + + variant
osx_64 - - variant + + variant
osx_arm64 - - variant + + variant
linux_64 - variant + variant
linux_aarch64 - variant + variant
linux_ppc64le - variant + variant
osx_64 - variant + variant
osx_arm64 - variant + variant
win_64 + + variant + +
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 33a441c..6b346f5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,4 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file From 3e58030c6406934e98e6f730ca65201f4b33c022 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 5 Feb 2023 14:46:30 +1100 Subject: [PATCH 058/105] move patches to folder --- recipe/meta.yaml | 6 +++--- .../0001-Deactivate-aggressive-failures-on-warnings.patch | 0 ...n-t-force-orc-to-be-a-static-library-let-end-user-.patch | 0 ...0003-CMake-Add-more-hints-for-libraries-on-Windows.patch | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename recipe/{ => patches}/0001-Deactivate-aggressive-failures-on-warnings.patch (100%) rename recipe/{ => patches}/0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch (100%) rename recipe/{ => patches}/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch (100%) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index da697d6..a144076 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,9 +10,9 @@ source: patches: # ORC builds by default with -Werror but some dependencies omit warnings. # This deactivates -Werror - - 0001-Deactivate-aggressive-failures-on-warnings.patch - - 0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch - - 0003-CMake-Add-more-hints-for-libraries-on-Windows.patch + - patches/0001-Deactivate-aggressive-failures-on-warnings.patch + - patches/0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch + - patches/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch build: number: 1 diff --git a/recipe/0001-Deactivate-aggressive-failures-on-warnings.patch b/recipe/patches/0001-Deactivate-aggressive-failures-on-warnings.patch similarity index 100% rename from recipe/0001-Deactivate-aggressive-failures-on-warnings.patch rename to recipe/patches/0001-Deactivate-aggressive-failures-on-warnings.patch diff --git a/recipe/0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch b/recipe/patches/0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch similarity index 100% rename from recipe/0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch rename to recipe/patches/0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch diff --git a/recipe/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch b/recipe/patches/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch similarity index 100% rename from recipe/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch rename to recipe/patches/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch From 5bd63e1e31d3ab985cc4a9651ef0533732901718 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 5 Feb 2023 14:48:40 +1100 Subject: [PATCH 059/105] add CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS to ensure import library is created --- recipe/bld.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index ab8e7e9..f15a7e2 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -1,6 +1,7 @@ cmake -S %SRC_DIR% -Bbuild ^ -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^ -DCMAKE_BUILD_TYPE=Release ^ + -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON ^ -DBUILD_SHARED_LIBS=ON ^ -DBUILD_JAVA=False ^ -DLZ4_HOME=%LIBRARY_PREFIX% ^ From e75b4147b62084a24f80c322b3e31bf3dd3c3640 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 5 Feb 2023 14:53:28 +1100 Subject: [PATCH 060/105] update tests for windows --- recipe/meta.yaml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a144076..d17e535 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -36,8 +36,19 @@ requirements: test: commands: - - test -f $PREFIX/lib/liborc${SHLIB_EXT} # [unix] - - test -f $PREFIX/include/orc/Common.hh # [unix] + # shared libraries + - test -f $PREFIX/lib/liborc.so # [linux] + - test -f $PREFIX/lib/liborc.dylib # [osx] + - if not exist %LIBRARY_BIN%\orc.dll exit 1 # [win] + # import library for the DLL + - if not exist %LIBRARY_LIB%\orc.lib exit 1 # [win] + + # absence of static libraries + - test ! -f $PREFIX/lib/liborc.a # [not win] + + # headers + - test -f $PREFIX/include/orc/Common.hh # [unix] + - if not exist %LIBRARY_INC%\orc\Common.hh exit 1 # [win] about: home: http://github.com/apache/orc From 5eb675d04485129a6a5567ebd10be35e80dcf801 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 5 Feb 2023 14:53:33 +1100 Subject: [PATCH 061/105] bump build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d17e535..30c40bb 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,7 +15,7 @@ source: - patches/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch build: - number: 1 + number: 2 run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From 10b0b318c7375ffce01d6c7063d62c8e1941e6a8 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 5 Feb 2023 15:26:40 +1100 Subject: [PATCH 062/105] add dev_url --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 30c40bb..28182cc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -56,6 +56,7 @@ about: license_family: Apache license_file: LICENSE summary: C++ libraries for Apache ORC + dev_url: https://github.com/apache/orc extra: recipe-maintainers: From 4f31f9407e8f0cb0fc951b11a870afa05188813b Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 5 Feb 2023 15:32:47 +1100 Subject: [PATCH 063/105] don't force lib destination --- recipe/meta.yaml | 1 + ...vate-aggressive-failures-on-warnings.patch | 10 ++++----- ...to-be-a-static-library-let-end-user-.patch | 10 ++++----- ...-more-hints-for-libraries-on-Windows.patch | 6 ++--- .../0004-don-t-force-lib-destination.patch | 22 +++++++++++++++++++ 5 files changed, 36 insertions(+), 13 deletions(-) create mode 100644 recipe/patches/0004-don-t-force-lib-destination.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 28182cc..54c4f51 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,6 +13,7 @@ source: - patches/0001-Deactivate-aggressive-failures-on-warnings.patch - patches/0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch - patches/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch + - patches/0004-don-t-force-lib-destination.patch build: number: 2 diff --git a/recipe/patches/0001-Deactivate-aggressive-failures-on-warnings.patch b/recipe/patches/0001-Deactivate-aggressive-failures-on-warnings.patch index 215a070..e4f62ec 100644 --- a/recipe/patches/0001-Deactivate-aggressive-failures-on-warnings.patch +++ b/recipe/patches/0001-Deactivate-aggressive-failures-on-warnings.patch @@ -1,17 +1,17 @@ -From e58ecc69728783e0012dd7091228c2902223d425 Mon Sep 17 00:00:00 2001 +From 647fbbbb80ca7bb3b1e273eb8d9e7b0a4915cfec Mon Sep 17 00:00:00 2001 From: "Korn, Uwe" Date: Tue, 19 Mar 2019 11:16:02 +0100 -Subject: [PATCH 1/2] Deactivate aggressive failures on warnings +Subject: [PATCH 1/4] Deactivate aggressive failures on warnings --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7c0e8413..03708879 100644 +index c0439e9ce..d19e6cd13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -124,6 +124,8 @@ elseif (MSVC) +@@ -135,6 +135,8 @@ elseif (MSVC) set (WARN_FLAGS "${WARN_FLAGS} -wd4146") # unary minus operator applied to unsigned type, result still unsigned endif () @@ -21,5 +21,5 @@ index 7c0e8413..03708879 100644 INCLUDE(CheckSourceCompiles) -- -2.31.1 +2.38.1.windows.1 diff --git a/recipe/patches/0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch b/recipe/patches/0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch index b0e9642..87935eb 100644 --- a/recipe/patches/0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch +++ b/recipe/patches/0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch @@ -1,7 +1,7 @@ -From 63812f30cbdda9cb5dc862622b86eb03e12f6940 Mon Sep 17 00:00:00 2001 +From c32bb0b4d917c0351b80af5c18135b0272f0a347 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Fri, 25 Sep 2020 14:49:59 -0400 -Subject: [PATCH 2/2] Don't force orc to be a static library, let end user +Subject: [PATCH 2/4] Don't force orc to be a static library, let end user control it --- @@ -9,10 +9,10 @@ Subject: [PATCH 2/2] Don't force orc to be a static library, let end user 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt -index 772f4c66..cdade462 100644 +index d4cd03504..442806ee8 100644 --- a/c++/src/CMakeLists.txt +++ b/c++/src/CMakeLists.txt -@@ -228,7 +228,7 @@ if(BUILD_LIBHDFSPP) +@@ -236,7 +236,7 @@ if(BUILD_LIBHDFSPP) add_definitions(-DBUILD_LIBHDFSPP) endif(BUILD_LIBHDFSPP) @@ -22,5 +22,5 @@ index 772f4c66..cdade462 100644 target_link_libraries (orc orc::protobuf -- -2.31.1 +2.38.1.windows.1 diff --git a/recipe/patches/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch b/recipe/patches/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch index fbde40f..2c9cbb6 100644 --- a/recipe/patches/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch +++ b/recipe/patches/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch @@ -1,7 +1,7 @@ -From f45ae86fbcd645fb69808f1d373cd0151e5230cc Mon Sep 17 00:00:00 2001 +From 973fdd63c19564d95264eede1d769cfab1c8c7d7 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sat, 4 Feb 2023 20:50:40 +0000 -Subject: [PATCH 3/3] CMake: Add more hints for libraries on Windows +Subject: [PATCH 3/4] CMake: Add more hints for libraries on Windows --- cmake_modules/FindLZ4.cmake | 2 +- @@ -44,5 +44,5 @@ index f2b6a7ca9..6f32e58f7 100644 PATH_SUFFIXES "lib") -- -2.33.1 +2.38.1.windows.1 diff --git a/recipe/patches/0004-don-t-force-lib-destination.patch b/recipe/patches/0004-don-t-force-lib-destination.patch new file mode 100644 index 0000000..229fad4 --- /dev/null +++ b/recipe/patches/0004-don-t-force-lib-destination.patch @@ -0,0 +1,22 @@ +From 6e9afb4f80c2c9e197d572add1cea19848276072 Mon Sep 17 00:00:00 2001 +From: "H. Vetinari" +Date: Sun, 5 Feb 2023 15:32:08 +1100 +Subject: [PATCH 4/4] don't force lib destination + +--- + c++/src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt +index 442806ee8..7b0829df4 100644 +--- a/c++/src/CMakeLists.txt ++++ b/c++/src/CMakeLists.txt +@@ -247,4 +247,4 @@ target_link_libraries (orc + ${LIBHDFSPP_LIBRARIES} + ) + +-install(TARGETS orc DESTINATION lib) ++install(TARGETS orc) +-- +2.38.1.windows.1 + From fb8e7bb27c27da01191cbd171783d9d318fc70a9 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 16 Mar 2023 07:55:55 +0000 Subject: [PATCH 064/105] updated v1.8.3 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 54c4f51..2d8af53 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.8.2" %} +{% set version = "1.8.3" %} package: name: orc @@ -6,7 +6,7 @@ package: source: url: https://archive.apache.org/dist/orc/orc-{{ version }}/orc-{{ version }}.tar.gz - sha256: 5e14501212abcb739ab0f3bdedf230c47e5138d9bf9f0e89e9a84b18bd084052 + sha256: a78678ec425c8129d63370cb8a9bacb54186aa66af1e2bec01ce92e7eaf72e20 patches: # ORC builds by default with -Werror but some dependencies omit warnings. # This deactivates -Werror @@ -16,7 +16,7 @@ source: - patches/0004-don-t-force-lib-destination.patch build: - number: 2 + number: 0 run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From a353588cfd83a3de35ad09bfc1f8c645dafd742d Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 16 Mar 2023 07:56:14 +0000 Subject: [PATCH 065/105] MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.23.0, and conda-forge-pinning 2023.03.16.06.20.58 --- .azure-pipelines/azure-pipelines-win.yml | 4 ++-- .scripts/build_steps.sh | 4 ++-- .scripts/run_osx_build.sh | 4 ++-- README.md | 10 ++++++---- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index a192c0b..8a96a72 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,7 +5,7 @@ jobs: - job: win pool: - vmImage: windows-2019 + vmImage: windows-2022 strategy: matrix: win_64_: @@ -36,7 +36,7 @@ jobs: - script: | call activate base - mamba.exe install "python=3.9" conda-build conda pip boa conda-forge-ci-setup=3 "py-lief<0.12" -c conda-forge --strict-channel-priority --yes + mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 84431a6..a6b09f6 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,9 +33,9 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + 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 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index b3abaeb..bb00584 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -24,9 +24,9 @@ source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + 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 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 diff --git a/README.md b/README.md index 334ef86..612733b 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,16 @@ -About orc -========= +About orc-feedstock +=================== + +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/orc-feedstock/blob/main/LICENSE.txt) Home: http://github.com/apache/orc Package license: Apache-2.0 -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/orc-feedstock/blob/main/LICENSE.txt) - Summary: C++ libraries for Apache ORC +Development: https://github.com/apache/orc + Current build status ==================== From 103718cffaa5be77c50d2e690d2039f6a4837a3a Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 27 May 2023 12:07:31 +0000 Subject: [PATCH 066/105] Rebuild for protobuf423 --- .ci_support/migrations/protobuf423.yaml | 11 +++++++++++ conda-forge.yml | 4 ++-- recipe/meta.yaml | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 .ci_support/migrations/protobuf423.yaml diff --git a/.ci_support/migrations/protobuf423.yaml b/.ci_support/migrations/protobuf423.yaml new file mode 100644 index 0000000..d3a462b --- /dev/null +++ b/.ci_support/migrations/protobuf423.yaml @@ -0,0 +1,11 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 2 +libgrpc: +- '1.54' +- '1.55' +libprotobuf: +- '3.21' +- '4.23.2' +migrator_ts: 1684932016.2362208 diff --git a/conda-forge.yml b/conda-forge.yml index c371034..092b9fd 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -2,6 +2,8 @@ build_platform: linux_aarch64: linux_64 linux_ppc64le: linux_64 osx_arm64: osx_64 +conda_build: + pkg_format: '2' conda_forge_output_validation: true github: branch_name: main @@ -10,5 +12,3 @@ provider: linux_aarch64: default linux_ppc64le: default test_on_native_only: true -conda_build: - pkg_format: '2' diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2d8af53..3d3fd82 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -16,7 +16,7 @@ source: - patches/0004-don-t-force-lib-destination.patch build: - number: 0 + number: 1 run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From 916616ad096d2c4013ba5ac9684b1abd49046be5 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 27 May 2023 12:07:50 +0000 Subject: [PATCH 067/105] MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.05.27.05.40.12 --- .azure-pipelines/azure-pipelines-linux.yml | 24 +++++-- .azure-pipelines/azure-pipelines-osx.yml | 14 ++-- .azure-pipelines/azure-pipelines-win.yml | 7 +- ...64_.yaml => linux_64_libprotobuf3.21.yaml} | 4 +- .ci_support/linux_64_libprotobuf4.23.2.yaml | 31 +++++++++ ...aml => linux_aarch64_libprotobuf3.21.yaml} | 4 +- .../linux_aarch64_libprotobuf4.23.2.yaml | 35 ++++++++++ ...aml => linux_ppc64le_libprotobuf3.21.yaml} | 4 +- .../linux_ppc64le_libprotobuf4.23.2.yaml | 31 +++++++++ ...x_64_.yaml => osx_64_libprotobuf3.21.yaml} | 4 +- .ci_support/osx_64_libprotobuf4.23.2.yaml | 31 +++++++++ ...4_.yaml => osx_arm64_libprotobuf3.21.yaml} | 4 +- .ci_support/osx_arm64_libprotobuf4.23.2.yaml | 31 +++++++++ ...n_64_.yaml => win_64_libprotobuf3.21.yaml} | 0 .ci_support/win_64_libprotobuf4.23.2.yaml | 20 ++++++ README.md | 66 +++++++++++++++---- 16 files changed, 276 insertions(+), 34 deletions(-) rename .ci_support/{linux_64_.yaml => linux_64_libprotobuf3.21.yaml} (96%) create mode 100644 .ci_support/linux_64_libprotobuf4.23.2.yaml rename .ci_support/{linux_aarch64_.yaml => linux_aarch64_libprotobuf3.21.yaml} (96%) create mode 100644 .ci_support/linux_aarch64_libprotobuf4.23.2.yaml rename .ci_support/{linux_ppc64le_.yaml => linux_ppc64le_libprotobuf3.21.yaml} (96%) create mode 100644 .ci_support/linux_ppc64le_libprotobuf4.23.2.yaml rename .ci_support/{osx_64_.yaml => osx_64_libprotobuf3.21.yaml} (96%) create mode 100644 .ci_support/osx_64_libprotobuf4.23.2.yaml rename .ci_support/{osx_arm64_.yaml => osx_arm64_libprotobuf3.21.yaml} (96%) create mode 100644 .ci_support/osx_arm64_libprotobuf4.23.2.yaml rename .ci_support/{win_64_.yaml => win_64_libprotobuf3.21.yaml} (100%) create mode 100644 .ci_support/win_64_libprotobuf4.23.2.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 3b9dee7..63bbe75 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,16 +8,28 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_: - CONFIG: linux_64_ + linux_64_libprotobuf3.21: + CONFIG: linux_64_libprotobuf3.21 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_: - CONFIG: linux_aarch64_ + linux_64_libprotobuf4.23.2: + CONFIG: linux_64_libprotobuf4.23.2 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_: - CONFIG: linux_ppc64le_ + linux_aarch64_libprotobuf3.21: + CONFIG: linux_aarch64_libprotobuf3.21 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_libprotobuf4.23.2: + CONFIG: linux_aarch64_libprotobuf4.23.2 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_libprotobuf3.21: + CONFIG: linux_ppc64le_libprotobuf3.21 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_libprotobuf4.23.2: + CONFIG: linux_ppc64le_libprotobuf4.23.2 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 8032e96..e251113 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,11 +8,17 @@ jobs: vmImage: macOS-11 strategy: matrix: - osx_64_: - CONFIG: osx_64_ + osx_64_libprotobuf3.21: + CONFIG: osx_64_libprotobuf3.21 UPLOAD_PACKAGES: 'True' - osx_arm64_: - CONFIG: osx_arm64_ + osx_64_libprotobuf4.23.2: + CONFIG: osx_64_libprotobuf4.23.2 + UPLOAD_PACKAGES: 'True' + osx_arm64_libprotobuf3.21: + CONFIG: osx_arm64_libprotobuf3.21 + UPLOAD_PACKAGES: 'True' + osx_arm64_libprotobuf4.23.2: + CONFIG: osx_arm64_libprotobuf4.23.2 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 8a96a72..4ed2701 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,8 +8,11 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_: - CONFIG: win_64_ + win_64_libprotobuf3.21: + CONFIG: win_64_libprotobuf3.21 + UPLOAD_PACKAGES: 'True' + win_64_libprotobuf4.23.2: + CONFIG: win_64_libprotobuf4.23.2 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_libprotobuf3.21.yaml similarity index 96% rename from .ci_support/linux_64_.yaml rename to .ci_support/linux_64_libprotobuf3.21.yaml index baec626..251434b 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_libprotobuf3.21.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos6 channel_sources: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: diff --git a/.ci_support/linux_64_libprotobuf4.23.2.yaml b/.ci_support/linux_64_libprotobuf4.23.2.yaml new file mode 100644 index 0000000..f7c0f01 --- /dev/null +++ b/.ci_support/linux_64_libprotobuf4.23.2.yaml @@ -0,0 +1,31 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +libprotobuf: +- 4.23.2 +lz4_c: +- 1.9.3 +snappy: +- '1' +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' +zstd: +- '1.5' diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_libprotobuf3.21.yaml similarity index 96% rename from .ci_support/linux_aarch64_.yaml rename to .ci_support/linux_aarch64_libprotobuf3.21.yaml index 51ca5e1..d83b787 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_libprotobuf3.21.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_arch: - aarch64 cdt_name: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: diff --git a/.ci_support/linux_aarch64_libprotobuf4.23.2.yaml b/.ci_support/linux_aarch64_libprotobuf4.23.2.yaml new file mode 100644 index 0000000..3439336 --- /dev/null +++ b/.ci_support/linux_aarch64_libprotobuf4.23.2.yaml @@ -0,0 +1,35 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +libprotobuf: +- 4.23.2 +lz4_c: +- 1.9.3 +snappy: +- '1' +target_platform: +- linux-aarch64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' +zstd: +- '1.5' diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_libprotobuf3.21.yaml similarity index 96% rename from .ci_support/linux_ppc64le_.yaml rename to .ci_support/linux_ppc64le_libprotobuf3.21.yaml index 8f65022..fac0f3e 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_libprotobuf3.21.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos7 channel_sources: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: diff --git a/.ci_support/linux_ppc64le_libprotobuf4.23.2.yaml b/.ci_support/linux_ppc64le_libprotobuf4.23.2.yaml new file mode 100644 index 0000000..527d762 --- /dev/null +++ b/.ci_support/linux_ppc64le_libprotobuf4.23.2.yaml @@ -0,0 +1,31 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +libprotobuf: +- 4.23.2 +lz4_c: +- 1.9.3 +snappy: +- '1' +target_platform: +- linux-ppc64le +zip_keys: +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' +zstd: +- '1.5' diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_libprotobuf3.21.yaml similarity index 96% rename from .ci_support/osx_64_.yaml rename to .ci_support/osx_64_libprotobuf3.21.yaml index c786c11..f6fc4d8 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_libprotobuf3.21.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' libprotobuf: - '3.21' lz4_c: diff --git a/.ci_support/osx_64_libprotobuf4.23.2.yaml b/.ci_support/osx_64_libprotobuf4.23.2.yaml new file mode 100644 index 0000000..1b263b2 --- /dev/null +++ b/.ci_support/osx_64_libprotobuf4.23.2.yaml @@ -0,0 +1,31 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +c_compiler: +- clang +c_compiler_version: +- '15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '15' +libprotobuf: +- 4.23.2 +lz4_c: +- 1.9.3 +macos_machine: +- x86_64-apple-darwin13.4.0 +snappy: +- '1' +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' +zstd: +- '1.5' diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_libprotobuf3.21.yaml similarity index 96% rename from .ci_support/osx_arm64_.yaml rename to .ci_support/osx_arm64_libprotobuf3.21.yaml index 4a9f719..24b6f2b 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_libprotobuf3.21.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' libprotobuf: - '3.21' lz4_c: diff --git a/.ci_support/osx_arm64_libprotobuf4.23.2.yaml b/.ci_support/osx_arm64_libprotobuf4.23.2.yaml new file mode 100644 index 0000000..876bc4e --- /dev/null +++ b/.ci_support/osx_arm64_libprotobuf4.23.2.yaml @@ -0,0 +1,31 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '15' +libprotobuf: +- 4.23.2 +lz4_c: +- 1.9.3 +macos_machine: +- arm64-apple-darwin20.0.0 +snappy: +- '1' +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' +zstd: +- '1.5' diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_libprotobuf3.21.yaml similarity index 100% rename from .ci_support/win_64_.yaml rename to .ci_support/win_64_libprotobuf3.21.yaml diff --git a/.ci_support/win_64_libprotobuf4.23.2.yaml b/.ci_support/win_64_libprotobuf4.23.2.yaml new file mode 100644 index 0000000..9015deb --- /dev/null +++ b/.ci_support/win_64_libprotobuf4.23.2.yaml @@ -0,0 +1,20 @@ +c_compiler: +- vs2019 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +libprotobuf: +- 4.23.2 +lz4_c: +- 1.9.3 +snappy: +- '1' +target_platform: +- win-64 +zlib: +- '1.2' +zstd: +- '1.5' diff --git a/README.md b/README.md index 612733b..68c2fc2 100644 --- a/README.md +++ b/README.md @@ -29,45 +29,87 @@ Current build status - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + From 119b83d45d46232ba640a9adfa145d395faab3c4 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Mon, 29 May 2023 14:14:26 +0100 Subject: [PATCH 068/105] Backport https://github.com/apache/orc/commit/286992e1 --- recipe/meta.yaml | 1 + ...vate-aggressive-failures-on-warnings.patch | 8 +- ...to-be-a-static-library-let-end-user-.patch | 6 +- ...-more-hints-for-libraries-on-Windows.patch | 6 +- .../0004-don-t-force-lib-destination.patch | 6 +- .../0005-ORC-1301-C-Enforce-C-17.patch | 175 ++++++++++++++++++ 6 files changed, 189 insertions(+), 13 deletions(-) create mode 100644 recipe/patches/0005-ORC-1301-C-Enforce-C-17.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3d3fd82..c03891f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,6 +14,7 @@ source: - patches/0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch - patches/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch - patches/0004-don-t-force-lib-destination.patch + - patches/0005-ORC-1301-C-Enforce-C-17.patch build: number: 1 diff --git a/recipe/patches/0001-Deactivate-aggressive-failures-on-warnings.patch b/recipe/patches/0001-Deactivate-aggressive-failures-on-warnings.patch index e4f62ec..7332eab 100644 --- a/recipe/patches/0001-Deactivate-aggressive-failures-on-warnings.patch +++ b/recipe/patches/0001-Deactivate-aggressive-failures-on-warnings.patch @@ -1,14 +1,14 @@ -From 647fbbbb80ca7bb3b1e273eb8d9e7b0a4915cfec Mon Sep 17 00:00:00 2001 +From a2953ded67c164993b6f55ae71e0c4e8b1b6ee19 Mon Sep 17 00:00:00 2001 From: "Korn, Uwe" Date: Tue, 19 Mar 2019 11:16:02 +0100 -Subject: [PATCH 1/4] Deactivate aggressive failures on warnings +Subject: [PATCH 1/5] Deactivate aggressive failures on warnings --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index c0439e9ce..d19e6cd13 100644 +index afe219381..7de33b53a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -135,6 +135,8 @@ elseif (MSVC) @@ -21,5 +21,5 @@ index c0439e9ce..d19e6cd13 100644 INCLUDE(CheckSourceCompiles) -- -2.38.1.windows.1 +2.40.0 diff --git a/recipe/patches/0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch b/recipe/patches/0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch index 87935eb..2b05d6f 100644 --- a/recipe/patches/0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch +++ b/recipe/patches/0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch @@ -1,7 +1,7 @@ -From c32bb0b4d917c0351b80af5c18135b0272f0a347 Mon Sep 17 00:00:00 2001 +From d64fcc38525aca05b03664f3056eb544a4f95906 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Fri, 25 Sep 2020 14:49:59 -0400 -Subject: [PATCH 2/4] Don't force orc to be a static library, let end user +Subject: [PATCH 2/5] Don't force orc to be a static library, let end user control it --- @@ -22,5 +22,5 @@ index d4cd03504..442806ee8 100644 target_link_libraries (orc orc::protobuf -- -2.38.1.windows.1 +2.40.0 diff --git a/recipe/patches/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch b/recipe/patches/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch index 2c9cbb6..26ce3b6 100644 --- a/recipe/patches/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch +++ b/recipe/patches/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch @@ -1,7 +1,7 @@ -From 973fdd63c19564d95264eede1d769cfab1c8c7d7 Mon Sep 17 00:00:00 2001 +From 059ad5ab87190a2ecbda92bd6ac372a768cb63d8 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sat, 4 Feb 2023 20:50:40 +0000 -Subject: [PATCH 3/4] CMake: Add more hints for libraries on Windows +Subject: [PATCH 3/5] CMake: Add more hints for libraries on Windows --- cmake_modules/FindLZ4.cmake | 2 +- @@ -44,5 +44,5 @@ index f2b6a7ca9..6f32e58f7 100644 PATH_SUFFIXES "lib") -- -2.38.1.windows.1 +2.40.0 diff --git a/recipe/patches/0004-don-t-force-lib-destination.patch b/recipe/patches/0004-don-t-force-lib-destination.patch index 229fad4..21a0293 100644 --- a/recipe/patches/0004-don-t-force-lib-destination.patch +++ b/recipe/patches/0004-don-t-force-lib-destination.patch @@ -1,7 +1,7 @@ -From 6e9afb4f80c2c9e197d572add1cea19848276072 Mon Sep 17 00:00:00 2001 +From f4ad8c0dcd9d063b4409e99ba787be57eaf24bca Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 5 Feb 2023 15:32:08 +1100 -Subject: [PATCH 4/4] don't force lib destination +Subject: [PATCH 4/5] don't force lib destination --- c++/src/CMakeLists.txt | 2 +- @@ -18,5 +18,5 @@ index 442806ee8..7b0829df4 100644 -install(TARGETS orc DESTINATION lib) +install(TARGETS orc) -- -2.38.1.windows.1 +2.40.0 diff --git a/recipe/patches/0005-ORC-1301-C-Enforce-C-17.patch b/recipe/patches/0005-ORC-1301-C-Enforce-C-17.patch new file mode 100644 index 0000000..73695a5 --- /dev/null +++ b/recipe/patches/0005-ORC-1301-C-Enforce-C-17.patch @@ -0,0 +1,175 @@ +From f0ca14e5e3bd777f4aacf264d7525ee78374915c Mon Sep 17 00:00:00 2001 +From: Gang Wu +Date: Sat, 29 Oct 2022 01:00:34 -0700 +Subject: [PATCH 5/5] ORC-1301: [C++] Enforce C++17 + +Enforce the C++ library to use C++17 to compile. + +To keep up the pace of modern C++ standard and improve development efficiency. + +Manual test on laptop. It requires all GitHub action checks to pass. + +Closes #1295 from wgtmac/ORC-1301. + +Authored-by: Gang Wu +Signed-off-by: Dongjoon Hyun +--- + CMakeLists.txt | 36 ++++++++++++++++++------- + c++/src/CMakeLists.txt | 2 +- + c++/test/CMakeLists.txt | 2 +- + c++/test/MemoryOutputStream.hh | 2 +- + cmake_modules/CheckSourceCompiles.cmake | 2 +- + tools/src/CMakeLists.txt | 2 +- + tools/test/CMakeLists.txt | 2 +- + 7 files changed, 33 insertions(+), 15 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7de33b53a..dffaf729d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -86,14 +86,27 @@ endif () + # + # Compiler specific flags + # ++# This ensures that things like c++17 get passed correctly ++if(NOT DEFINED CMAKE_CXX_STANDARD) ++ set(CMAKE_CXX_STANDARD 17) ++elseif(${CMAKE_CXX_STANDARD} VERSION_LESS 17) ++ message(FATAL_ERROR "Cannot set a CMAKE_CXX_STANDARD smaller than 17") ++endif() ++# We require a C++17 compliant compiler ++set(CMAKE_CXX_STANDARD_REQUIRED ON) + if (NOT MSVC) + set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -fno-omit-frame-pointer") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG -fno-omit-frame-pointer") + set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG") + endif () + message(STATUS "compiler ${CMAKE_CXX_COMPILER_ID} version ${CMAKE_CXX_COMPILER_VERSION}") +-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") +- set (CXX11_FLAGS "-std=c++11") ++if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") ++ if (CMAKE_CXX_COMPILER_VERSION STREQUAL "" OR ++ CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0") ++ message(FATAL_ERROR "A c++17-compliant compiler is required, please use at least Clang 5") ++ else () ++ set (CXX17_FLAGS "-std=c++17") ++ endif () + set (WARN_FLAGS "-Weverything -Wno-c++98-compat -Wno-missing-prototypes") + set (WARN_FLAGS "${WARN_FLAGS} -Wno-c++98-compat-pedantic -Wno-padded") + set (WARN_FLAGS "${WARN_FLAGS} -Wno-covered-switch-default") +@@ -112,22 +125,27 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + set (WARN_FLAGS "${WARN_FLAGS} -Werror") + endif () + elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") ++ if (CMAKE_CXX_COMPILER_VERSION STREQUAL "" OR ++ CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0") ++ message(FATAL_ERROR "A c++17-compliant compiler is required, please use at least GCC 5") ++ else () ++ set (CXX17_FLAGS "-std=c++17") ++ endif () + set (WARN_FLAGS "-Wall -Wno-unknown-pragmas -Wconversion") + if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "12.0") + set (WARN_FLAGS "${WARN_FLAGS} -Wno-array-bounds -Wno-stringop-overread") # To compile protobuf in Fedora37 +- elseif (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9") +- set (WARN_FLAGS "${WARN_FLAGS} -Wno-unused-function") + endif () + if (STOP_BUILD_ON_WARNING) + set (WARN_FLAGS "${WARN_FLAGS} -Werror") + endif () +- if (CMAKE_CXX_COMPILER_VERSION STREQUAL "" OR +- CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7") +- set (CXX11_FLAGS "-std=c++0x") ++elseif (MSVC) ++ include(CheckCXXCompilerFlag) ++ CHECK_CXX_COMPILER_FLAG("/std:c++17" CPP17_FLAG_SUPPORTED) ++ if (CPP17_FLAG_SUPPORTED) ++ add_compile_options("/std:c++17") + else () +- set (CXX11_FLAGS "-std=c++11") ++ message(FATAL_ERROR "A c++17-compliant compiler is required") + endif () +-elseif (MSVC) + add_definitions (-D_SCL_SECURE_NO_WARNINGS) + add_definitions (-D_CRT_SECURE_NO_WARNINGS) + add_definitions (-D_CRT_NONSTDC_NO_DEPRECATE) # The POSIX name for this item is deprecated +diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt +index 7b0829df4..07fd43d50 100644 +--- a/c++/src/CMakeLists.txt ++++ b/c++/src/CMakeLists.txt +@@ -10,7 +10,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_FLAGS} ${WARN_FLAGS}") ++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX17_FLAGS} ${WARN_FLAGS}") + + INCLUDE(CheckCXXSourceCompiles) + +diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt +index 00aca6b55..874f50c5e 100644 +--- a/c++/test/CMakeLists.txt ++++ b/c++/test/CMakeLists.txt +@@ -16,7 +16,7 @@ include_directories( + ${PROJECT_BINARY_DIR}/c++/src + ) + +-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_FLAGS} ${WARN_FLAGS}") ++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX17_FLAGS} ${WARN_FLAGS}") + + add_executable (orc-test + MemoryInputStream.cc +diff --git a/c++/test/MemoryOutputStream.hh b/c++/test/MemoryOutputStream.hh +index 6b23a34eb..30368934f 100644 +--- a/c++/test/MemoryOutputStream.hh ++++ b/c++/test/MemoryOutputStream.hh +@@ -28,7 +28,7 @@ namespace orc { + + class MemoryOutputStream : public OutputStream { + public: +- MemoryOutputStream(ssize_t capacity) : name("MemoryOutputStream") { ++ MemoryOutputStream(size_t capacity) : name("MemoryOutputStream") { + data = new char[capacity]; + length = 0; + } +diff --git a/cmake_modules/CheckSourceCompiles.cmake b/cmake_modules/CheckSourceCompiles.cmake +index 7f337fc70..3168560df 100644 +--- a/cmake_modules/CheckSourceCompiles.cmake ++++ b/cmake_modules/CheckSourceCompiles.cmake +@@ -10,7 +10,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_FLAGS} ${WARN_FLAGS}") ++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX17_FLAGS} ${WARN_FLAGS}") + + INCLUDE(CheckCXXSourceCompiles) + +diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt +index 4b89aced9..886e84d41 100644 +--- a/tools/src/CMakeLists.txt ++++ b/tools/src/CMakeLists.txt +@@ -24,7 +24,7 @@ include_directories ( + ${PROJECT_BINARY_DIR}/c++/src + ) + +-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g ${CXX11_FLAGS} ${WARN_FLAGS}") ++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g ${CXX17_FLAGS} ${WARN_FLAGS}") + + add_executable (orc-contents + FileContents.cc +diff --git a/tools/test/CMakeLists.txt b/tools/test/CMakeLists.txt +index fe2be1d70..537a4f960 100644 +--- a/tools/test/CMakeLists.txt ++++ b/tools/test/CMakeLists.txt +@@ -18,7 +18,7 @@ include_directories( + ${PROJECT_BINARY_DIR}/c++/src + ) + +-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_FLAGS} ${WARN_FLAGS}") ++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX17_FLAGS} ${WARN_FLAGS}") + + add_executable (tool-test + gzip.cc +-- +2.40.0 + From 1eab71f520a3db026f0a2f9ee1219378dd15639e Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sun, 4 Jun 2023 01:30:00 +0100 Subject: [PATCH 069/105] Use -DPROTOBUF_USE_DLLS on macOS --- recipe/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/build.sh b/recipe/build.sh index 900968d..f0b1c21 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -16,6 +16,7 @@ if [[ ${HOST} =~ .*darwin.* ]]; then _CMAKE_EXTRA_CONFIG+=(-DCMAKE_AR=${AR}) _CMAKE_EXTRA_CONFIG+=(-DCMAKE_RANLIB=${RANLIB}) _CMAKE_EXTRA_CONFIG+=(-DCMAKE_LINKER=${LD}) + CXXFLAGS="${CXXFLAGS} -DPROTOBUF_USE_DLLS" fi if [[ ${HOST} =~ .*linux.* ]]; then CXXFLAGS="${CXXFLAGS//-std=c++17/-std=c++11}" From abf274c3ca4165cafad0c8d09462bf51fde1b1e2 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sun, 4 Jun 2023 01:30:11 +0100 Subject: [PATCH 070/105] Check for protobuf config based module --- recipe/meta.yaml | 1 + ...eck-for-protobuf-config-based-module.patch | 41 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 recipe/patches/0006-Check-for-protobuf-config-based-module.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c03891f..295a1b0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,6 +15,7 @@ source: - patches/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch - patches/0004-don-t-force-lib-destination.patch - patches/0005-ORC-1301-C-Enforce-C-17.patch + - patches/0006-Check-for-protobuf-config-based-module.patch build: number: 1 diff --git a/recipe/patches/0006-Check-for-protobuf-config-based-module.patch b/recipe/patches/0006-Check-for-protobuf-config-based-module.patch new file mode 100644 index 0000000..7790f4a --- /dev/null +++ b/recipe/patches/0006-Check-for-protobuf-config-based-module.patch @@ -0,0 +1,41 @@ +From e0ae3ed1a5c1ddb67eca460e0fa5ed363c76a3cf Mon Sep 17 00:00:00 2001 +From: Nehal J Wani +Date: Sun, 4 Jun 2023 10:35:32 +0100 +Subject: [PATCH 6/6] Check for protobuf config based module + +--- + cmake_modules/FindProtobuf.cmake | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/cmake_modules/FindProtobuf.cmake b/cmake_modules/FindProtobuf.cmake +index f2b6a7ca9..58cf946ce 100644 +--- a/cmake_modules/FindProtobuf.cmake ++++ b/cmake_modules/FindProtobuf.cmake +@@ -21,6 +21,24 @@ + # PROTOBUF_EXECUTABLE: location of protoc + + ++find_package(Protobuf CONFIG) ++if(Protobuf_FOUND) ++ set(PROTOBUF_LIBRARY protobuf::libprotobuf) ++ set(PROTOBUF_STATIC_LIB PROTOBUF_STATIC_LIB-NOTFOUND) ++ set(PROTOC_LIBRARY protobuf::libprotoc) ++ set(PROTOC_STATIC_LIB PROTOC_STATIC_LIB-NOTFOUND) ++ get_target_property(target_type protobuf::libprotobuf TYPE) ++ if(target_type STREQUAL "STATIC_LIBRARY") ++ set(PROTOBUF_STATIC_LIB protobuf::libprotobuf) ++ endif() ++ get_target_property(target_type protobuf::libprotoc TYPE) ++ if(target_type STREQUAL "STATIC_LIBRARY") ++ set(PROTOC_STATIC_LIB protobuf::libprotoc) ++ endif() ++ get_target_property(PROTOBUF_INCLUDE_DIR protobuf::libprotoc INTERFACE_INCLUDE_DIRECTORIES) ++ return() ++endif() ++ + if( NOT "${PROTOBUF_HOME}" STREQUAL "") + file (TO_CMAKE_PATH "${PROTOBUF_HOME}" _protobuf_path) + endif() +-- +2.40.1 + From 0d0cbe164f177b8cd6579cce22c614c57ba00e89 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 14 Jun 2023 09:56:29 +0000 Subject: [PATCH 071/105] updated v1.8.4 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 295a1b0..0561c18 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.8.3" %} +{% set version = "1.8.4" %} package: name: orc @@ -6,7 +6,7 @@ package: source: url: https://archive.apache.org/dist/orc/orc-{{ version }}/orc-{{ version }}.tar.gz - sha256: a78678ec425c8129d63370cb8a9bacb54186aa66af1e2bec01ce92e7eaf72e20 + sha256: 1a4400c1daea0997728b5d5a2e022ea3d9389540a9551e3ee2588c2e9566c4b0 patches: # ORC builds by default with -Werror but some dependencies omit warnings. # This deactivates -Werror @@ -18,7 +18,7 @@ source: - patches/0006-Check-for-protobuf-config-based-module.patch build: - number: 1 + number: 0 run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From 6a4f756595c15a02ec21fa2faffab6c71ab924b3 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 28 Jun 2023 22:12:20 +0000 Subject: [PATCH 072/105] updated v1.9.0 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0561c18..32c2432 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.8.4" %} +{% set version = "1.9.0" %} package: name: orc @@ -6,7 +6,7 @@ package: source: url: https://archive.apache.org/dist/orc/orc-{{ version }}/orc-{{ version }}.tar.gz - sha256: 1a4400c1daea0997728b5d5a2e022ea3d9389540a9551e3ee2588c2e9566c4b0 + sha256: 0dca8bbccdb2ee87e59ba964933436beebd02ea78c4134424828a8127fbc4faa patches: # ORC builds by default with -Werror but some dependencies omit warnings. # This deactivates -Werror From 87a910c5abf731f249425fc7d7144501bc44ba4d Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Fri, 30 Jun 2023 00:03:25 +0100 Subject: [PATCH 073/105] Rebase patches for v1.9.0 --- recipe/build.sh | 1 - recipe/meta.yaml | 3 +- ...vate-aggressive-failures-on-warnings.patch | 10 +- ...to-be-a-static-library-let-end-user-.patch | 12 +- ...-more-hints-for-libraries-on-Windows.patch | 14 +- .../0004-don-t-force-lib-destination.patch | 8 +- ...ck-for-protobuf-config-based-module.patch} | 10 +- .../0005-ORC-1301-C-Enforce-C-17.patch | 175 ------------------ 8 files changed, 28 insertions(+), 205 deletions(-) rename recipe/patches/{0006-Check-for-protobuf-config-based-module.patch => 0005-Check-for-protobuf-config-based-module.patch} (87%) delete mode 100644 recipe/patches/0005-ORC-1301-C-Enforce-C-17.patch diff --git a/recipe/build.sh b/recipe/build.sh index f0b1c21..f1608e5 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -19,7 +19,6 @@ if [[ ${HOST} =~ .*darwin.* ]]; then CXXFLAGS="${CXXFLAGS} -DPROTOBUF_USE_DLLS" fi if [[ ${HOST} =~ .*linux.* ]]; then - CXXFLAGS="${CXXFLAGS//-std=c++17/-std=c++11}" # I hate you so much CMake. LIBPTHREAD=$(find ${PREFIX} -name "libpthread.so") _CMAKE_EXTRA_CONFIG+=(-DPTHREAD_LIBRARY=${LIBPTHREAD}) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 32c2432..e868716 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,8 +14,7 @@ source: - patches/0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch - patches/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch - patches/0004-don-t-force-lib-destination.patch - - patches/0005-ORC-1301-C-Enforce-C-17.patch - - patches/0006-Check-for-protobuf-config-based-module.patch + - patches/0005-Check-for-protobuf-config-based-module.patch build: number: 0 diff --git a/recipe/patches/0001-Deactivate-aggressive-failures-on-warnings.patch b/recipe/patches/0001-Deactivate-aggressive-failures-on-warnings.patch index 7332eab..275df9c 100644 --- a/recipe/patches/0001-Deactivate-aggressive-failures-on-warnings.patch +++ b/recipe/patches/0001-Deactivate-aggressive-failures-on-warnings.patch @@ -1,4 +1,4 @@ -From a2953ded67c164993b6f55ae71e0c4e8b1b6ee19 Mon Sep 17 00:00:00 2001 +From c12e690560c91b7a1593b57a8b390696d73296db Mon Sep 17 00:00:00 2001 From: "Korn, Uwe" Date: Tue, 19 Mar 2019 11:16:02 +0100 Subject: [PATCH 1/5] Deactivate aggressive failures on warnings @@ -8,11 +8,11 @@ Subject: [PATCH 1/5] Deactivate aggressive failures on warnings 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index afe219381..7de33b53a 100644 +index dcd4e7fd1..4fbda3544 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -135,6 +135,8 @@ elseif (MSVC) - set (WARN_FLAGS "${WARN_FLAGS} -wd4146") # unary minus operator applied to unsigned type, result still unsigned +@@ -177,6 +177,8 @@ else () + add_compile_definitions(ENABLE_METRICS=0) endif () +set(WARN_FLAGS "") @@ -21,5 +21,5 @@ index afe219381..7de33b53a 100644 INCLUDE(CheckSourceCompiles) -- -2.40.0 +2.41.0 diff --git a/recipe/patches/0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch b/recipe/patches/0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch index 2b05d6f..f4c982f 100644 --- a/recipe/patches/0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch +++ b/recipe/patches/0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch @@ -1,4 +1,4 @@ -From d64fcc38525aca05b03664f3056eb544a4f95906 Mon Sep 17 00:00:00 2001 +From fdf87a2f344a25e0e92a174fc3acbccc200b9f11 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Fri, 25 Sep 2020 14:49:59 -0400 Subject: [PATCH 2/5] Don't force orc to be a static library, let end user @@ -9,12 +9,12 @@ Subject: [PATCH 2/5] Don't force orc to be a static library, let end user 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt -index d4cd03504..442806ee8 100644 +index 972f2fc03..898f223f4 100644 --- a/c++/src/CMakeLists.txt +++ b/c++/src/CMakeLists.txt -@@ -236,7 +236,7 @@ if(BUILD_LIBHDFSPP) - add_definitions(-DBUILD_LIBHDFSPP) - endif(BUILD_LIBHDFSPP) +@@ -206,7 +206,7 @@ if(BUILD_ENABLE_AVX512) + BpackingAvx512.cc) + endif(BUILD_ENABLE_AVX512) -add_library (orc STATIC ${SOURCE_FILES}) +add_library (orc ${SOURCE_FILES}) @@ -22,5 +22,5 @@ index d4cd03504..442806ee8 100644 target_link_libraries (orc orc::protobuf -- -2.40.0 +2.41.0 diff --git a/recipe/patches/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch b/recipe/patches/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch index 26ce3b6..5fb2a47 100644 --- a/recipe/patches/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch +++ b/recipe/patches/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch @@ -1,4 +1,4 @@ -From 059ad5ab87190a2ecbda92bd6ac372a768cb63d8 Mon Sep 17 00:00:00 2001 +From b449aaf29458c56777387f50217c45747626675f Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sat, 4 Feb 2023 20:50:40 +0000 Subject: [PATCH 3/5] CMake: Add more hints for libraries on Windows @@ -9,10 +9,10 @@ Subject: [PATCH 3/5] CMake: Add more hints for libraries on Windows 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake_modules/FindLZ4.cmake b/cmake_modules/FindLZ4.cmake -index f57984940..c466745e6 100644 +index b1557f496..8061dda38 100644 --- a/cmake_modules/FindLZ4.cmake +++ b/cmake_modules/FindLZ4.cmake -@@ -28,7 +28,7 @@ find_path (LZ4_INCLUDE_DIR lz4.h HINTS +@@ -33,7 +33,7 @@ find_path (LZ4_INCLUDE_DIR lz4.h HINTS NO_DEFAULT_PATH PATH_SUFFIXES "include") @@ -22,10 +22,10 @@ index f57984940..c466745e6 100644 PATH_SUFFIXES "lib" "lib64") diff --git a/cmake_modules/FindProtobuf.cmake b/cmake_modules/FindProtobuf.cmake -index f2b6a7ca9..6f32e58f7 100644 +index c52f3131d..8af45bd92 100644 --- a/cmake_modules/FindProtobuf.cmake +++ b/cmake_modules/FindProtobuf.cmake -@@ -37,7 +37,7 @@ find_path (PROTOBUF_INCLUDE_DIR google/protobuf/io/coded_stream.h HINTS +@@ -42,7 +42,7 @@ find_path (PROTOBUF_INCLUDE_DIR google/protobuf/io/coded_stream.h HINTS NO_DEFAULT_PATH PATH_SUFFIXES "include") @@ -34,7 +34,7 @@ index f2b6a7ca9..6f32e58f7 100644 ${_protobuf_path} PATH_SUFFIXES "lib") -@@ -45,7 +45,7 @@ find_library (PROTOBUF_STATIC_LIB NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}protobuf${ +@@ -50,7 +50,7 @@ find_library (PROTOBUF_STATIC_LIB NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}protobuf${ ${_protobuf_path} PATH_SUFFIXES "lib") @@ -44,5 +44,5 @@ index f2b6a7ca9..6f32e58f7 100644 PATH_SUFFIXES "lib") -- -2.40.0 +2.41.0 diff --git a/recipe/patches/0004-don-t-force-lib-destination.patch b/recipe/patches/0004-don-t-force-lib-destination.patch index 21a0293..f9d3329 100644 --- a/recipe/patches/0004-don-t-force-lib-destination.patch +++ b/recipe/patches/0004-don-t-force-lib-destination.patch @@ -1,4 +1,4 @@ -From f4ad8c0dcd9d063b4409e99ba787be57eaf24bca Mon Sep 17 00:00:00 2001 +From 224455b380dc836ad5cac5ec367aced98345474d Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 5 Feb 2023 15:32:08 +1100 Subject: [PATCH 4/5] don't force lib destination @@ -8,15 +8,15 @@ Subject: [PATCH 4/5] don't force lib destination 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt -index 442806ee8..7b0829df4 100644 +index 898f223f4..b0eed1c7c 100644 --- a/c++/src/CMakeLists.txt +++ b/c++/src/CMakeLists.txt -@@ -247,4 +247,4 @@ target_link_libraries (orc +@@ -217,4 +217,4 @@ target_link_libraries (orc ${LIBHDFSPP_LIBRARIES} ) -install(TARGETS orc DESTINATION lib) +install(TARGETS orc) -- -2.40.0 +2.41.0 diff --git a/recipe/patches/0006-Check-for-protobuf-config-based-module.patch b/recipe/patches/0005-Check-for-protobuf-config-based-module.patch similarity index 87% rename from recipe/patches/0006-Check-for-protobuf-config-based-module.patch rename to recipe/patches/0005-Check-for-protobuf-config-based-module.patch index 7790f4a..f32f60f 100644 --- a/recipe/patches/0006-Check-for-protobuf-config-based-module.patch +++ b/recipe/patches/0005-Check-for-protobuf-config-based-module.patch @@ -1,17 +1,17 @@ -From e0ae3ed1a5c1ddb67eca460e0fa5ed363c76a3cf Mon Sep 17 00:00:00 2001 +From 85e312956a4868c96fd44c19d77b898519838b93 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sun, 4 Jun 2023 10:35:32 +0100 -Subject: [PATCH 6/6] Check for protobuf config based module +Subject: [PATCH 5/5] Check for protobuf config based module --- cmake_modules/FindProtobuf.cmake | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/cmake_modules/FindProtobuf.cmake b/cmake_modules/FindProtobuf.cmake -index f2b6a7ca9..58cf946ce 100644 +index 8af45bd92..ecbb7c933 100644 --- a/cmake_modules/FindProtobuf.cmake +++ b/cmake_modules/FindProtobuf.cmake -@@ -21,6 +21,24 @@ +@@ -26,6 +26,24 @@ # PROTOBUF_EXECUTABLE: location of protoc @@ -37,5 +37,5 @@ index f2b6a7ca9..58cf946ce 100644 file (TO_CMAKE_PATH "${PROTOBUF_HOME}" _protobuf_path) endif() -- -2.40.1 +2.41.0 diff --git a/recipe/patches/0005-ORC-1301-C-Enforce-C-17.patch b/recipe/patches/0005-ORC-1301-C-Enforce-C-17.patch deleted file mode 100644 index 73695a5..0000000 --- a/recipe/patches/0005-ORC-1301-C-Enforce-C-17.patch +++ /dev/null @@ -1,175 +0,0 @@ -From f0ca14e5e3bd777f4aacf264d7525ee78374915c Mon Sep 17 00:00:00 2001 -From: Gang Wu -Date: Sat, 29 Oct 2022 01:00:34 -0700 -Subject: [PATCH 5/5] ORC-1301: [C++] Enforce C++17 - -Enforce the C++ library to use C++17 to compile. - -To keep up the pace of modern C++ standard and improve development efficiency. - -Manual test on laptop. It requires all GitHub action checks to pass. - -Closes #1295 from wgtmac/ORC-1301. - -Authored-by: Gang Wu -Signed-off-by: Dongjoon Hyun ---- - CMakeLists.txt | 36 ++++++++++++++++++------- - c++/src/CMakeLists.txt | 2 +- - c++/test/CMakeLists.txt | 2 +- - c++/test/MemoryOutputStream.hh | 2 +- - cmake_modules/CheckSourceCompiles.cmake | 2 +- - tools/src/CMakeLists.txt | 2 +- - tools/test/CMakeLists.txt | 2 +- - 7 files changed, 33 insertions(+), 15 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7de33b53a..dffaf729d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -86,14 +86,27 @@ endif () - # - # Compiler specific flags - # -+# This ensures that things like c++17 get passed correctly -+if(NOT DEFINED CMAKE_CXX_STANDARD) -+ set(CMAKE_CXX_STANDARD 17) -+elseif(${CMAKE_CXX_STANDARD} VERSION_LESS 17) -+ message(FATAL_ERROR "Cannot set a CMAKE_CXX_STANDARD smaller than 17") -+endif() -+# We require a C++17 compliant compiler -+set(CMAKE_CXX_STANDARD_REQUIRED ON) - if (NOT MSVC) - set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -fno-omit-frame-pointer") - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG -fno-omit-frame-pointer") - set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG") - endif () - message(STATUS "compiler ${CMAKE_CXX_COMPILER_ID} version ${CMAKE_CXX_COMPILER_VERSION}") --if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") -- set (CXX11_FLAGS "-std=c++11") -+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") -+ if (CMAKE_CXX_COMPILER_VERSION STREQUAL "" OR -+ CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0") -+ message(FATAL_ERROR "A c++17-compliant compiler is required, please use at least Clang 5") -+ else () -+ set (CXX17_FLAGS "-std=c++17") -+ endif () - set (WARN_FLAGS "-Weverything -Wno-c++98-compat -Wno-missing-prototypes") - set (WARN_FLAGS "${WARN_FLAGS} -Wno-c++98-compat-pedantic -Wno-padded") - set (WARN_FLAGS "${WARN_FLAGS} -Wno-covered-switch-default") -@@ -112,22 +125,27 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - set (WARN_FLAGS "${WARN_FLAGS} -Werror") - endif () - elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") -+ if (CMAKE_CXX_COMPILER_VERSION STREQUAL "" OR -+ CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0") -+ message(FATAL_ERROR "A c++17-compliant compiler is required, please use at least GCC 5") -+ else () -+ set (CXX17_FLAGS "-std=c++17") -+ endif () - set (WARN_FLAGS "-Wall -Wno-unknown-pragmas -Wconversion") - if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "12.0") - set (WARN_FLAGS "${WARN_FLAGS} -Wno-array-bounds -Wno-stringop-overread") # To compile protobuf in Fedora37 -- elseif (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9") -- set (WARN_FLAGS "${WARN_FLAGS} -Wno-unused-function") - endif () - if (STOP_BUILD_ON_WARNING) - set (WARN_FLAGS "${WARN_FLAGS} -Werror") - endif () -- if (CMAKE_CXX_COMPILER_VERSION STREQUAL "" OR -- CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7") -- set (CXX11_FLAGS "-std=c++0x") -+elseif (MSVC) -+ include(CheckCXXCompilerFlag) -+ CHECK_CXX_COMPILER_FLAG("/std:c++17" CPP17_FLAG_SUPPORTED) -+ if (CPP17_FLAG_SUPPORTED) -+ add_compile_options("/std:c++17") - else () -- set (CXX11_FLAGS "-std=c++11") -+ message(FATAL_ERROR "A c++17-compliant compiler is required") - endif () --elseif (MSVC) - add_definitions (-D_SCL_SECURE_NO_WARNINGS) - add_definitions (-D_CRT_SECURE_NO_WARNINGS) - add_definitions (-D_CRT_NONSTDC_NO_DEPRECATE) # The POSIX name for this item is deprecated -diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt -index 7b0829df4..07fd43d50 100644 ---- a/c++/src/CMakeLists.txt -+++ b/c++/src/CMakeLists.txt -@@ -10,7 +10,7 @@ - # See the License for the specific language governing permissions and - # limitations under the License. - --set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_FLAGS} ${WARN_FLAGS}") -+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX17_FLAGS} ${WARN_FLAGS}") - - INCLUDE(CheckCXXSourceCompiles) - -diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt -index 00aca6b55..874f50c5e 100644 ---- a/c++/test/CMakeLists.txt -+++ b/c++/test/CMakeLists.txt -@@ -16,7 +16,7 @@ include_directories( - ${PROJECT_BINARY_DIR}/c++/src - ) - --set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_FLAGS} ${WARN_FLAGS}") -+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX17_FLAGS} ${WARN_FLAGS}") - - add_executable (orc-test - MemoryInputStream.cc -diff --git a/c++/test/MemoryOutputStream.hh b/c++/test/MemoryOutputStream.hh -index 6b23a34eb..30368934f 100644 ---- a/c++/test/MemoryOutputStream.hh -+++ b/c++/test/MemoryOutputStream.hh -@@ -28,7 +28,7 @@ namespace orc { - - class MemoryOutputStream : public OutputStream { - public: -- MemoryOutputStream(ssize_t capacity) : name("MemoryOutputStream") { -+ MemoryOutputStream(size_t capacity) : name("MemoryOutputStream") { - data = new char[capacity]; - length = 0; - } -diff --git a/cmake_modules/CheckSourceCompiles.cmake b/cmake_modules/CheckSourceCompiles.cmake -index 7f337fc70..3168560df 100644 ---- a/cmake_modules/CheckSourceCompiles.cmake -+++ b/cmake_modules/CheckSourceCompiles.cmake -@@ -10,7 +10,7 @@ - # See the License for the specific language governing permissions and - # limitations under the License. - --set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_FLAGS} ${WARN_FLAGS}") -+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX17_FLAGS} ${WARN_FLAGS}") - - INCLUDE(CheckCXXSourceCompiles) - -diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt -index 4b89aced9..886e84d41 100644 ---- a/tools/src/CMakeLists.txt -+++ b/tools/src/CMakeLists.txt -@@ -24,7 +24,7 @@ include_directories ( - ${PROJECT_BINARY_DIR}/c++/src - ) - --set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g ${CXX11_FLAGS} ${WARN_FLAGS}") -+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g ${CXX17_FLAGS} ${WARN_FLAGS}") - - add_executable (orc-contents - FileContents.cc -diff --git a/tools/test/CMakeLists.txt b/tools/test/CMakeLists.txt -index fe2be1d70..537a4f960 100644 ---- a/tools/test/CMakeLists.txt -+++ b/tools/test/CMakeLists.txt -@@ -18,7 +18,7 @@ include_directories( - ${PROJECT_BINARY_DIR}/c++/src - ) - --set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_FLAGS} ${WARN_FLAGS}") -+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX17_FLAGS} ${WARN_FLAGS}") - - add_executable (tool-test - gzip.cc --- -2.40.0 - From 7729c86c7c43b04967d38213806636160dd7df0f Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 1 Jul 2023 13:32:28 +0000 Subject: [PATCH 074/105] Rebuild for libprotobuf4233_libgrpc156 --- .../migrations/libprotobuf4233_libgrpc156.yaml | 11 +++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libprotobuf4233_libgrpc156.yaml diff --git a/.ci_support/migrations/libprotobuf4233_libgrpc156.yaml b/.ci_support/migrations/libprotobuf4233_libgrpc156.yaml new file mode 100644 index 0000000..5fd0340 --- /dev/null +++ b/.ci_support/migrations/libprotobuf4233_libgrpc156.yaml @@ -0,0 +1,11 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +libgrpc: +- '1.54' +- '1.56' +libprotobuf: +- '3.21' +- '4.23.3' +migrator_ts: 1688154716.9176981 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e868716..c318754 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,7 +17,7 @@ source: - patches/0005-Check-for-protobuf-config-based-module.patch build: - number: 0 + number: 1 run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From ba9dcd420d7cbec0f7d4502c6cfd4378ea4faaf5 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 1 Jul 2023 13:32:42 +0000 Subject: [PATCH 075/105] MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.07.01.05.57.24 --- .azure-pipelines/azure-pipelines-linux.yml | 12 +++++----- .azure-pipelines/azure-pipelines-osx.yml | 8 +++---- .azure-pipelines/azure-pipelines-win.yml | 4 ++-- ...2.yaml => linux_64_libprotobuf4.23.3.yaml} | 2 +- ...l => linux_aarch64_libprotobuf4.23.3.yaml} | 2 +- ...l => linux_ppc64le_libprotobuf4.23.3.yaml} | 2 +- .ci_support/migrations/protobuf423.yaml | 11 --------- ...3.2.yaml => osx_64_libprotobuf4.23.3.yaml} | 2 +- ....yaml => osx_arm64_libprotobuf4.23.3.yaml} | 2 +- ...3.2.yaml => win_64_libprotobuf4.23.3.yaml} | 2 +- README.md | 24 +++++++++---------- 11 files changed, 30 insertions(+), 41 deletions(-) rename .ci_support/{linux_64_libprotobuf4.23.2.yaml => linux_64_libprotobuf4.23.3.yaml} (97%) rename .ci_support/{linux_aarch64_libprotobuf4.23.2.yaml => linux_aarch64_libprotobuf4.23.3.yaml} (98%) rename .ci_support/{linux_ppc64le_libprotobuf4.23.2.yaml => linux_ppc64le_libprotobuf4.23.3.yaml} (97%) delete mode 100644 .ci_support/migrations/protobuf423.yaml rename .ci_support/{osx_64_libprotobuf4.23.2.yaml => osx_64_libprotobuf4.23.3.yaml} (97%) rename .ci_support/{osx_arm64_libprotobuf4.23.2.yaml => osx_arm64_libprotobuf4.23.3.yaml} (97%) rename .ci_support/{win_64_libprotobuf4.23.2.yaml => win_64_libprotobuf4.23.3.yaml} (95%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 63bbe75..fdf1db2 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -12,24 +12,24 @@ jobs: CONFIG: linux_64_libprotobuf3.21 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_libprotobuf4.23.2: - CONFIG: linux_64_libprotobuf4.23.2 + linux_64_libprotobuf4.23.3: + CONFIG: linux_64_libprotobuf4.23.3 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_libprotobuf3.21: CONFIG: linux_aarch64_libprotobuf3.21 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_libprotobuf4.23.2: - CONFIG: linux_aarch64_libprotobuf4.23.2 + linux_aarch64_libprotobuf4.23.3: + CONFIG: linux_aarch64_libprotobuf4.23.3 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_ppc64le_libprotobuf3.21: CONFIG: linux_ppc64le_libprotobuf3.21 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_libprotobuf4.23.2: - CONFIG: linux_ppc64le_libprotobuf4.23.2 + linux_ppc64le_libprotobuf4.23.3: + CONFIG: linux_ppc64le_libprotobuf4.23.3 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index e251113..7ad47f0 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -11,14 +11,14 @@ jobs: osx_64_libprotobuf3.21: CONFIG: osx_64_libprotobuf3.21 UPLOAD_PACKAGES: 'True' - osx_64_libprotobuf4.23.2: - CONFIG: osx_64_libprotobuf4.23.2 + osx_64_libprotobuf4.23.3: + CONFIG: osx_64_libprotobuf4.23.3 UPLOAD_PACKAGES: 'True' osx_arm64_libprotobuf3.21: CONFIG: osx_arm64_libprotobuf3.21 UPLOAD_PACKAGES: 'True' - osx_arm64_libprotobuf4.23.2: - CONFIG: osx_arm64_libprotobuf4.23.2 + osx_arm64_libprotobuf4.23.3: + CONFIG: osx_arm64_libprotobuf4.23.3 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 4ed2701..b02ece3 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -11,8 +11,8 @@ jobs: win_64_libprotobuf3.21: CONFIG: win_64_libprotobuf3.21 UPLOAD_PACKAGES: 'True' - win_64_libprotobuf4.23.2: - CONFIG: win_64_libprotobuf4.23.2 + win_64_libprotobuf4.23.3: + CONFIG: win_64_libprotobuf4.23.3 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_libprotobuf4.23.2.yaml b/.ci_support/linux_64_libprotobuf4.23.3.yaml similarity index 97% rename from .ci_support/linux_64_libprotobuf4.23.2.yaml rename to .ci_support/linux_64_libprotobuf4.23.3.yaml index f7c0f01..fc5759d 100644 --- a/.ci_support/linux_64_libprotobuf4.23.2.yaml +++ b/.ci_support/linux_64_libprotobuf4.23.3.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- 4.23.2 +- 4.23.3 lz4_c: - 1.9.3 snappy: diff --git a/.ci_support/linux_aarch64_libprotobuf4.23.2.yaml b/.ci_support/linux_aarch64_libprotobuf4.23.3.yaml similarity index 98% rename from .ci_support/linux_aarch64_libprotobuf4.23.2.yaml rename to .ci_support/linux_aarch64_libprotobuf4.23.3.yaml index 3439336..c1d6e92 100644 --- a/.ci_support/linux_aarch64_libprotobuf4.23.2.yaml +++ b/.ci_support/linux_aarch64_libprotobuf4.23.3.yaml @@ -19,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- 4.23.2 +- 4.23.3 lz4_c: - 1.9.3 snappy: diff --git a/.ci_support/linux_ppc64le_libprotobuf4.23.2.yaml b/.ci_support/linux_ppc64le_libprotobuf4.23.3.yaml similarity index 97% rename from .ci_support/linux_ppc64le_libprotobuf4.23.2.yaml rename to .ci_support/linux_ppc64le_libprotobuf4.23.3.yaml index 527d762..1d2297a 100644 --- a/.ci_support/linux_ppc64le_libprotobuf4.23.2.yaml +++ b/.ci_support/linux_ppc64le_libprotobuf4.23.3.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- 4.23.2 +- 4.23.3 lz4_c: - 1.9.3 snappy: diff --git a/.ci_support/migrations/protobuf423.yaml b/.ci_support/migrations/protobuf423.yaml deleted file mode 100644 index d3a462b..0000000 --- a/.ci_support/migrations/protobuf423.yaml +++ /dev/null @@ -1,11 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 2 -libgrpc: -- '1.54' -- '1.55' -libprotobuf: -- '3.21' -- '4.23.2' -migrator_ts: 1684932016.2362208 diff --git a/.ci_support/osx_64_libprotobuf4.23.2.yaml b/.ci_support/osx_64_libprotobuf4.23.3.yaml similarity index 97% rename from .ci_support/osx_64_libprotobuf4.23.2.yaml rename to .ci_support/osx_64_libprotobuf4.23.3.yaml index 1b263b2..7b05d65 100644 --- a/.ci_support/osx_64_libprotobuf4.23.2.yaml +++ b/.ci_support/osx_64_libprotobuf4.23.3.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '15' libprotobuf: -- 4.23.2 +- 4.23.3 lz4_c: - 1.9.3 macos_machine: diff --git a/.ci_support/osx_arm64_libprotobuf4.23.2.yaml b/.ci_support/osx_arm64_libprotobuf4.23.3.yaml similarity index 97% rename from .ci_support/osx_arm64_libprotobuf4.23.2.yaml rename to .ci_support/osx_arm64_libprotobuf4.23.3.yaml index 876bc4e..591ec04 100644 --- a/.ci_support/osx_arm64_libprotobuf4.23.2.yaml +++ b/.ci_support/osx_arm64_libprotobuf4.23.3.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '15' libprotobuf: -- 4.23.2 +- 4.23.3 lz4_c: - 1.9.3 macos_machine: diff --git a/.ci_support/win_64_libprotobuf4.23.2.yaml b/.ci_support/win_64_libprotobuf4.23.3.yaml similarity index 95% rename from .ci_support/win_64_libprotobuf4.23.2.yaml rename to .ci_support/win_64_libprotobuf4.23.3.yaml index 9015deb..9b9081e 100644 --- a/.ci_support/win_64_libprotobuf4.23.2.yaml +++ b/.ci_support/win_64_libprotobuf4.23.3.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - vs2019 libprotobuf: -- 4.23.2 +- 4.23.3 lz4_c: - 1.9.3 snappy: diff --git a/README.md b/README.md index 68c2fc2..9a6dce9 100644 --- a/README.md +++ b/README.md @@ -36,10 +36,10 @@ Current build status - + @@ -50,10 +50,10 @@ Current build status - + @@ -64,10 +64,10 @@ Current build status - + @@ -78,10 +78,10 @@ Current build status - + @@ -92,10 +92,10 @@ Current build status - + @@ -106,10 +106,10 @@ Current build status - + From 0d7fde2a5c4505a1197b1e1b9094755c514e856e Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sun, 10 Sep 2023 06:47:22 +0000 Subject: [PATCH 076/105] Rebuild for libabseil20230802_libgrpc157_libprotobuf4234 --- ...ibabseil20230802_libgrpc157_libprotobuf4234.yaml | 13 +++++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libabseil20230802_libgrpc157_libprotobuf4234.yaml diff --git a/.ci_support/migrations/libabseil20230802_libgrpc157_libprotobuf4234.yaml b/.ci_support/migrations/libabseil20230802_libgrpc157_libprotobuf4234.yaml new file mode 100644 index 0000000..3781ea0 --- /dev/null +++ b/.ci_support/migrations/libabseil20230802_libgrpc157_libprotobuf4234.yaml @@ -0,0 +1,13 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +libabseil: +- 20230802 +libgrpc: +- "1.57" +libprotobuf: +- 4.23.4 +MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] +- "10.13" # [osx and x86_64] +migrator_ts: 1692632590.658328 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c318754..fc5489c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,7 +17,7 @@ source: - patches/0005-Check-for-protobuf-config-based-module.patch build: - number: 1 + number: 2 run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From e962c65e3c167ec50cc2bdef262990815360f7a6 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sun, 10 Sep 2023 06:47:34 +0000 Subject: [PATCH 077/105] MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.25.1, and conda-forge-pinning 2023.09.10.06.39.04 --- .azure-pipelines/azure-pipelines-linux.yml | 29 ++------ .azure-pipelines/azure-pipelines-osx.yml | 14 ++-- .azure-pipelines/azure-pipelines-win.yml | 12 ++-- ...64_libprotobuf3.21.yaml => linux_64_.yaml} | 2 +- .ci_support/linux_64_libprotobuf4.23.3.yaml | 31 --------- ...bprotobuf3.21.yaml => linux_aarch64_.yaml} | 2 +- .../linux_aarch64_libprotobuf4.23.3.yaml | 35 ---------- ...bprotobuf3.21.yaml => linux_ppc64le_.yaml} | 2 +- .../linux_ppc64le_libprotobuf4.23.3.yaml | 31 --------- .../libprotobuf4233_libgrpc156.yaml | 11 ---- ...x_64_libprotobuf3.21.yaml => osx_64_.yaml} | 4 +- .ci_support/osx_64_libprotobuf4.23.3.yaml | 31 --------- ...4_libprotobuf3.21.yaml => osx_arm64_.yaml} | 2 +- .ci_support/osx_arm64_libprotobuf4.23.3.yaml | 31 --------- ...n_64_libprotobuf3.21.yaml => win_64_.yaml} | 2 +- .ci_support/win_64_libprotobuf4.23.3.yaml | 20 ------ .scripts/run_osx_build.sh | 10 +-- README.md | 66 ++++--------------- 18 files changed, 40 insertions(+), 295 deletions(-) rename .ci_support/{linux_64_libprotobuf3.21.yaml => linux_64_.yaml} (97%) delete mode 100644 .ci_support/linux_64_libprotobuf4.23.3.yaml rename .ci_support/{linux_aarch64_libprotobuf3.21.yaml => linux_aarch64_.yaml} (98%) delete mode 100644 .ci_support/linux_aarch64_libprotobuf4.23.3.yaml rename .ci_support/{linux_ppc64le_libprotobuf3.21.yaml => linux_ppc64le_.yaml} (97%) delete mode 100644 .ci_support/linux_ppc64le_libprotobuf4.23.3.yaml delete mode 100644 .ci_support/migrations/libprotobuf4233_libgrpc156.yaml rename .ci_support/{osx_64_libprotobuf3.21.yaml => osx_64_.yaml} (95%) delete mode 100644 .ci_support/osx_64_libprotobuf4.23.3.yaml rename .ci_support/{osx_arm64_libprotobuf3.21.yaml => osx_arm64_.yaml} (97%) delete mode 100644 .ci_support/osx_arm64_libprotobuf4.23.3.yaml rename .ci_support/{win_64_libprotobuf3.21.yaml => win_64_.yaml} (95%) delete mode 100644 .ci_support/win_64_libprotobuf4.23.3.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index fdf1db2..fcb0974 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,38 +8,21 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_libprotobuf3.21: - CONFIG: linux_64_libprotobuf3.21 + linux_64_: + CONFIG: linux_64_ UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_libprotobuf4.23.3: - CONFIG: linux_64_libprotobuf4.23.3 + linux_aarch64_: + CONFIG: linux_aarch64_ UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_libprotobuf3.21: - CONFIG: linux_aarch64_libprotobuf3.21 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_libprotobuf4.23.3: - CONFIG: linux_aarch64_libprotobuf4.23.3 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_libprotobuf3.21: - CONFIG: linux_ppc64le_libprotobuf3.21 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_libprotobuf4.23.3: - CONFIG: linux_ppc64le_libprotobuf4.23.3 + linux_ppc64le_: + CONFIG: linux_ppc64le_ UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 steps: - - script: | - rm -rf /opt/ghc - df -h - displayName: Manage disk space - # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 7ad47f0..8032e96 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,17 +8,11 @@ jobs: vmImage: macOS-11 strategy: matrix: - osx_64_libprotobuf3.21: - CONFIG: osx_64_libprotobuf3.21 + osx_64_: + CONFIG: osx_64_ UPLOAD_PACKAGES: 'True' - osx_64_libprotobuf4.23.3: - CONFIG: osx_64_libprotobuf4.23.3 - UPLOAD_PACKAGES: 'True' - osx_arm64_libprotobuf3.21: - CONFIG: osx_arm64_libprotobuf3.21 - UPLOAD_PACKAGES: 'True' - osx_arm64_libprotobuf4.23.3: - CONFIG: osx_arm64_libprotobuf4.23.3 + osx_arm64_: + CONFIG: osx_arm64_ UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index b02ece3..d66c7d1 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,11 +8,8 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_libprotobuf3.21: - CONFIG: win_64_libprotobuf3.21 - UPLOAD_PACKAGES: 'True' - win_64_libprotobuf4.23.3: - CONFIG: win_64_libprotobuf4.23.3 + win_64_: + CONFIG: win_64_ UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: @@ -63,7 +60,10 @@ jobs: if EXIST LICENSE.txt ( copy LICENSE.txt "recipe\\recipe-scripts-license.txt" ) - conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables + if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + ) + conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% displayName: Build recipe env: PYTHONUNBUFFERED: 1 diff --git a/.ci_support/linux_64_libprotobuf3.21.yaml b/.ci_support/linux_64_.yaml similarity index 97% rename from .ci_support/linux_64_libprotobuf3.21.yaml rename to .ci_support/linux_64_.yaml index 251434b..23e5b14 100644 --- a/.ci_support/linux_64_libprotobuf3.21.yaml +++ b/.ci_support/linux_64_.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- '3.21' +- 4.23.4 lz4_c: - 1.9.3 snappy: diff --git a/.ci_support/linux_64_libprotobuf4.23.3.yaml b/.ci_support/linux_64_libprotobuf4.23.3.yaml deleted file mode 100644 index fc5759d..0000000 --- a/.ci_support/linux_64_libprotobuf4.23.3.yaml +++ /dev/null @@ -1,31 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -libprotobuf: -- 4.23.3 -lz4_c: -- 1.9.3 -snappy: -- '1' -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -zlib: -- '1.2' -zstd: -- '1.5' diff --git a/.ci_support/linux_aarch64_libprotobuf3.21.yaml b/.ci_support/linux_aarch64_.yaml similarity index 98% rename from .ci_support/linux_aarch64_libprotobuf3.21.yaml rename to .ci_support/linux_aarch64_.yaml index d83b787..c58c2dc 100644 --- a/.ci_support/linux_aarch64_libprotobuf3.21.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -19,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- '3.21' +- 4.23.4 lz4_c: - 1.9.3 snappy: diff --git a/.ci_support/linux_aarch64_libprotobuf4.23.3.yaml b/.ci_support/linux_aarch64_libprotobuf4.23.3.yaml deleted file mode 100644 index c1d6e92..0000000 --- a/.ci_support/linux_aarch64_libprotobuf4.23.3.yaml +++ /dev/null @@ -1,35 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -libprotobuf: -- 4.23.3 -lz4_c: -- 1.9.3 -snappy: -- '1' -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -zlib: -- '1.2' -zstd: -- '1.5' diff --git a/.ci_support/linux_ppc64le_libprotobuf3.21.yaml b/.ci_support/linux_ppc64le_.yaml similarity index 97% rename from .ci_support/linux_ppc64le_libprotobuf3.21.yaml rename to .ci_support/linux_ppc64le_.yaml index fac0f3e..60ae51e 100644 --- a/.ci_support/linux_ppc64le_libprotobuf3.21.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- '3.21' +- 4.23.4 lz4_c: - 1.9.3 snappy: diff --git a/.ci_support/linux_ppc64le_libprotobuf4.23.3.yaml b/.ci_support/linux_ppc64le_libprotobuf4.23.3.yaml deleted file mode 100644 index 1d2297a..0000000 --- a/.ci_support/linux_ppc64le_libprotobuf4.23.3.yaml +++ /dev/null @@ -1,31 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -libprotobuf: -- 4.23.3 -lz4_c: -- 1.9.3 -snappy: -- '1' -target_platform: -- linux-ppc64le -zip_keys: -- - c_compiler_version - - cxx_compiler_version -zlib: -- '1.2' -zstd: -- '1.5' diff --git a/.ci_support/migrations/libprotobuf4233_libgrpc156.yaml b/.ci_support/migrations/libprotobuf4233_libgrpc156.yaml deleted file mode 100644 index 5fd0340..0000000 --- a/.ci_support/migrations/libprotobuf4233_libgrpc156.yaml +++ /dev/null @@ -1,11 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libgrpc: -- '1.54' -- '1.56' -libprotobuf: -- '3.21' -- '4.23.3' -migrator_ts: 1688154716.9176981 diff --git a/.ci_support/osx_64_libprotobuf3.21.yaml b/.ci_support/osx_64_.yaml similarity index 95% rename from .ci_support/osx_64_libprotobuf3.21.yaml rename to .ci_support/osx_64_.yaml index f6fc4d8..2a335c8 100644 --- a/.ci_support/osx_64_libprotobuf3.21.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' c_compiler: - clang c_compiler_version: @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '15' libprotobuf: -- '3.21' +- 4.23.4 lz4_c: - 1.9.3 macos_machine: diff --git a/.ci_support/osx_64_libprotobuf4.23.3.yaml b/.ci_support/osx_64_libprotobuf4.23.3.yaml deleted file mode 100644 index 7b05d65..0000000 --- a/.ci_support/osx_64_libprotobuf4.23.3.yaml +++ /dev/null @@ -1,31 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_compiler: -- clang -c_compiler_version: -- '15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '15' -libprotobuf: -- 4.23.3 -lz4_c: -- 1.9.3 -macos_machine: -- x86_64-apple-darwin13.4.0 -snappy: -- '1' -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -zlib: -- '1.2' -zstd: -- '1.5' diff --git a/.ci_support/osx_arm64_libprotobuf3.21.yaml b/.ci_support/osx_arm64_.yaml similarity index 97% rename from .ci_support/osx_arm64_libprotobuf3.21.yaml rename to .ci_support/osx_arm64_.yaml index 24b6f2b..1cd1e92 100644 --- a/.ci_support/osx_arm64_libprotobuf3.21.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '15' libprotobuf: -- '3.21' +- 4.23.4 lz4_c: - 1.9.3 macos_machine: diff --git a/.ci_support/osx_arm64_libprotobuf4.23.3.yaml b/.ci_support/osx_arm64_libprotobuf4.23.3.yaml deleted file mode 100644 index 591ec04..0000000 --- a/.ci_support/osx_arm64_libprotobuf4.23.3.yaml +++ /dev/null @@ -1,31 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -c_compiler: -- clang -c_compiler_version: -- '15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '15' -libprotobuf: -- 4.23.3 -lz4_c: -- 1.9.3 -macos_machine: -- arm64-apple-darwin20.0.0 -snappy: -- '1' -target_platform: -- osx-arm64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -zlib: -- '1.2' -zstd: -- '1.5' diff --git a/.ci_support/win_64_libprotobuf3.21.yaml b/.ci_support/win_64_.yaml similarity index 95% rename from .ci_support/win_64_libprotobuf3.21.yaml rename to .ci_support/win_64_.yaml index ed48806..ba44c26 100644 --- a/.ci_support/win_64_libprotobuf3.21.yaml +++ b/.ci_support/win_64_.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - vs2019 libprotobuf: -- '3.21' +- 4.23.4 lz4_c: - 1.9.3 snappy: diff --git a/.ci_support/win_64_libprotobuf4.23.3.yaml b/.ci_support/win_64_libprotobuf4.23.3.yaml deleted file mode 100644 index 9b9081e..0000000 --- a/.ci_support/win_64_libprotobuf4.23.3.yaml +++ /dev/null @@ -1,20 +0,0 @@ -c_compiler: -- vs2019 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2019 -libprotobuf: -- 4.23.3 -lz4_c: -- 1.9.3 -snappy: -- '1' -target_platform: -- win-64 -zlib: -- '1.2' -zstd: -- '1.5' diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index bb00584..3969edf 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -55,11 +55,6 @@ source run_conda_forge_build_setup echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml -if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then - EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" -fi - - if [[ -f LICENSE.txt ]]; then cp LICENSE.txt "recipe/recipe-scripts-license.txt" fi @@ -75,6 +70,11 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else + + if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" + fi + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml diff --git a/README.md b/README.md index 9a6dce9..612733b 100644 --- a/README.md +++ b/README.md @@ -29,87 +29,45 @@ Current build status
VariantStatus
linux_64linux_64_libprotobuf3.21 - variant + variant
linux_aarch64linux_64_libprotobuf4.23.2 - variant + variant
linux_ppc64lelinux_aarch64_libprotobuf3.21 - variant + variant
osx_64linux_aarch64_libprotobuf4.23.2 - variant + variant
osx_arm64linux_ppc64le_libprotobuf3.21 - variant + variant
win_64linux_ppc64le_libprotobuf4.23.2 - variant + variant + +
osx_64_libprotobuf3.21 + + variant + +
osx_64_libprotobuf4.23.2 + + variant + +
osx_arm64_libprotobuf3.21 + + variant + +
osx_arm64_libprotobuf4.23.2 + + variant + +
win_64_libprotobuf3.21 + + variant + +
win_64_libprotobuf4.23.2 + + variant
linux_64_libprotobuf4.23.2linux_64_libprotobuf4.23.3 - variant + variant
linux_aarch64_libprotobuf4.23.2linux_aarch64_libprotobuf4.23.3 - variant + variant
linux_ppc64le_libprotobuf4.23.2linux_ppc64le_libprotobuf4.23.3 - variant + variant
osx_64_libprotobuf4.23.2osx_64_libprotobuf4.23.3 - variant + variant
osx_arm64_libprotobuf4.23.2osx_arm64_libprotobuf4.23.3 - variant + variant
win_64_libprotobuf4.23.2win_64_libprotobuf4.23.3 - variant + variant
- + - + - + - + - + - + - - - - - - - - - - - - - - - - - - From 11a1f712d61bbb985fe0ff9265ae505db6ebedcd Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sun, 8 Oct 2023 11:47:21 +0000 Subject: [PATCH 078/105] Rebuild for libgrpc158_libprotobuf4243 --- .../migrations/libgrpc158_libprotobuf4243.yaml | 16 ++++++++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libgrpc158_libprotobuf4243.yaml diff --git a/.ci_support/migrations/libgrpc158_libprotobuf4243.yaml b/.ci_support/migrations/libgrpc158_libprotobuf4243.yaml new file mode 100644 index 0000000..2e4dc06 --- /dev/null +++ b/.ci_support/migrations/libgrpc158_libprotobuf4243.yaml @@ -0,0 +1,16 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 + exclude: + # this shouldn't attempt to modify the python feedstocks + - protobuf +libgrpc: +- "1.58" +libprotobuf: +- 4.24.3 +# already covered by libabseil20230802_libgrpc157_libprotobuf4234, +# which we cannot delete yet, but keep for clarity +MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] +- "10.13" # [osx and x86_64] +migrator_ts: 1695803907.2958245 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index fc5489c..b60018e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,7 +17,7 @@ source: - patches/0005-Check-for-protobuf-config-based-module.patch build: - number: 2 + number: 3 run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From 0db60beaed106cd83c46890640ea6ff62f5f8297 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sun, 8 Oct 2023 11:47:29 +0000 Subject: [PATCH 079/105] MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and conda-forge-pinning 2023.10.08.10.53.16 --- .azure-pipelines/azure-pipelines-win.yml | 56 ++--------- .ci_support/linux_64_.yaml | 2 +- .ci_support/linux_aarch64_.yaml | 2 +- .ci_support/linux_ppc64le_.yaml | 2 +- .ci_support/osx_64_.yaml | 6 +- .ci_support/osx_arm64_.yaml | 6 +- .ci_support/win_64_.yaml | 2 +- .scripts/build_steps.sh | 9 +- .scripts/logging_utils.sh | 4 +- .scripts/run_osx_build.sh | 8 +- .scripts/run_win_build.bat | 115 +++++++++++++++++++++++ 11 files changed, 143 insertions(+), 69 deletions(-) create mode 100755 .scripts/run_win_build.bat diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index d66c7d1..82c5318 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -17,6 +17,7 @@ jobs: UPLOAD_TEMP: D:\\tmp steps: + - task: PythonScript@0 displayName: 'Download Miniforge' inputs: @@ -35,55 +36,14 @@ jobs: displayName: Add conda to PATH - script: | - call activate base - mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes - displayName: Install conda-build - - - script: set PYTHONUNBUFFERED=1 - displayName: Set PYTHONUNBUFFERED - - # Configure the VM - - script: | - call activate base - setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml - displayName: conda-forge CI setup - - # Configure the VM. - - script: | - set "CI=azure" - call activate base - run_conda_forge_build_setup - displayName: conda-forge build setup - - - script: | - call activate base - if EXIST LICENSE.txt ( - copy LICENSE.txt "recipe\\recipe-scripts-license.txt" - ) - if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" - ) - conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% - displayName: Build recipe + call ".scripts\run_win_build.bat" + displayName: Run Windows build env: PYTHONUNBUFFERED: 1 - - script: | - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - call activate base - validate_recipe_outputs "%FEEDSTOCK_NAME%" - displayName: Validate Recipe Outputs - - - script: | - set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - set "TEMP=$(UPLOAD_TEMP)" - if not exist "%TEMP%\" md "%TEMP%" - set "TMP=%TEMP%" - call activate base - upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml - displayName: Upload package - env: + CONFIG: $(CONFIG) + CI: azure + UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) + UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False')), not(eq(variables['Build.Reason'], 'PullRequest'))) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 23e5b14..dc2657e 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- 4.23.4 +- 4.24.3 lz4_c: - 1.9.3 snappy: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index c58c2dc..b13a77f 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -19,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- 4.23.4 +- 4.24.3 lz4_c: - 1.9.3 snappy: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 60ae51e..99675d9 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- 4.23.4 +- 4.24.3 lz4_c: - 1.9.3 snappy: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 2a335c8..6484ccd 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,9 +11,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' libprotobuf: -- 4.23.4 +- 4.24.3 lz4_c: - 1.9.3 macos_machine: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 1cd1e92..5ae81f6 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,9 +11,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' libprotobuf: -- 4.23.4 +- 4.24.3 lz4_c: - 1.9.3 macos_machine: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index ba44c26..d6672cf 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - vs2019 libprotobuf: -- 4.23.4 +- 4.24.3 lz4_c: - 1.9.3 snappy: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a6b09f6..bd9e671 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=3 # 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 57bc95c..aff009f 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/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 3969edf..870c49a 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,10 +23,10 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -mamba install --update-specs --quiet --yes --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 --quiet --yes --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=3 diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat new file mode 100755 index 0000000..07d3445 --- /dev/null +++ b/.scripts/run_win_build.bat @@ -0,0 +1,115 @@ +:: PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here +:: will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent +:: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also +:: benefit from the improvement. + +:: Note: we assume a Miniforge installation is available + +:: INPUTS (required environment variables) +:: CONFIG: name of the .ci_support/*.yaml file for this job +:: CI: azure, github_actions, or unset +:: UPLOAD_PACKAGES: true or false +:: UPLOAD_ON_BRANCH: true or false + +setlocal enableextensions enabledelayedexpansion + +call :start_group "Configuring conda" + +:: Activate the base conda environment +call activate base + +:: Provision the necessary dependencies to build the recipe later +echo Installing dependencies +mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes +if !errorlevel! neq 0 exit /b !errorlevel! + +:: Set basic configuration +echo Setting up configuration +setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml +if !errorlevel! neq 0 exit /b !errorlevel! +echo Running build setup +CALL run_conda_forge_build_setup + + +if !errorlevel! neq 0 exit /b !errorlevel! + +if EXIST LICENSE.txt ( + echo Copying feedstock license + copy LICENSE.txt "recipe\\recipe-scripts-license.txt" +) +if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" +) + +call :end_group + +:: Build the recipe +echo Building recipe +conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +if !errorlevel! neq 0 exit /b !errorlevel! + +:: Prepare some environment variables for the upload step +if /i "%CI%" == "github_actions" ( + set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" + set "GIT_BRANCH=%GITHUB_REF:refs/heads/=%" + if /i "%GITHUB_EVENT_NAME%" == "pull_request" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%RUNNER_TEMP%" +) +if /i "%CI%" == "azure" ( + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" + if /i "%BUILD_REASON%" == "PullRequest" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%UPLOAD_TEMP%" +) + +:: Validate +call :start_group "Validating outputs" +validate_recipe_outputs "%FEEDSTOCK_NAME%" +if !errorlevel! neq 0 exit /b !errorlevel! +call :end_group + +if /i "%UPLOAD_PACKAGES%" == "true" ( + if /i "%IS_PR_BUILD%" == "false" ( + call :start_group "Uploading packages" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" + upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml + if !errorlevel! neq 0 exit /b !errorlevel! + call :end_group + ) +) + +exit + +:: Logging subroutines + +:start_group +if /i "%CI%" == "github_actions" ( + echo ::group::%~1 + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[group]%~1 + exit /b +) +echo %~1 +exit /b + +:end_group +if /i "%CI%" == "github_actions" ( + echo ::endgroup:: + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[endgroup] + exit /b +) +exit /b \ No newline at end of file From 414a0df943e633480152e291d5624f1991dd1fe5 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 1 Nov 2023 20:30:21 +0000 Subject: [PATCH 080/105] Rebuild for libgrpc159_libprotobuf4244 --- .../migrations/libgrpc159_libprotobuf4244.yaml | 16 ++++++++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libgrpc159_libprotobuf4244.yaml diff --git a/.ci_support/migrations/libgrpc159_libprotobuf4244.yaml b/.ci_support/migrations/libgrpc159_libprotobuf4244.yaml new file mode 100644 index 0000000..8a51b6e --- /dev/null +++ b/.ci_support/migrations/libgrpc159_libprotobuf4244.yaml @@ -0,0 +1,16 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 + exclude: + # this shouldn't attempt to modify the python feedstocks + - protobuf +libgrpc: +- "1.59" +libprotobuf: +- 4.24.4 +# already covered by libabseil20230802_libgrpc157_libprotobuf4234, +# which we cannot delete yet, but keep for clarity +MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] +- "10.13" # [osx and x86_64] +migrator_ts: 1698833751.21557 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b60018e..fc9dacc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,7 +17,7 @@ source: - patches/0005-Check-for-protobuf-config-based-module.patch build: - number: 3 + number: 4 run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From b49b83afe0cac98368341c20e19a0decc0f919d4 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 1 Nov 2023 20:30:31 +0000 Subject: [PATCH 081/105] MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and conda-forge-pinning 2023.11.01.16.01.09 --- .ci_support/linux_64_.yaml | 2 +- .ci_support/linux_aarch64_.yaml | 2 +- .ci_support/linux_ppc64le_.yaml | 2 +- .../migrations/libgrpc158_libprotobuf4243.yaml | 16 ---------------- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .ci_support/win_64_.yaml | 2 +- 7 files changed, 6 insertions(+), 22 deletions(-) delete mode 100644 .ci_support/migrations/libgrpc158_libprotobuf4243.yaml diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index dc2657e..16a8670 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- 4.24.3 +- 4.24.4 lz4_c: - 1.9.3 snappy: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index b13a77f..ec264db 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -19,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- 4.24.3 +- 4.24.4 lz4_c: - 1.9.3 snappy: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 99675d9..adf6dbb 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- 4.24.3 +- 4.24.4 lz4_c: - 1.9.3 snappy: diff --git a/.ci_support/migrations/libgrpc158_libprotobuf4243.yaml b/.ci_support/migrations/libgrpc158_libprotobuf4243.yaml deleted file mode 100644 index 2e4dc06..0000000 --- a/.ci_support/migrations/libgrpc158_libprotobuf4243.yaml +++ /dev/null @@ -1,16 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 - exclude: - # this shouldn't attempt to modify the python feedstocks - - protobuf -libgrpc: -- "1.58" -libprotobuf: -- 4.24.3 -# already covered by libabseil20230802_libgrpc157_libprotobuf4234, -# which we cannot delete yet, but keep for clarity -MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] -- "10.13" # [osx and x86_64] -migrator_ts: 1695803907.2958245 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 6484ccd..b5ebd49 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '16' libprotobuf: -- 4.24.3 +- 4.24.4 lz4_c: - 1.9.3 macos_machine: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 5ae81f6..1109249 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '16' libprotobuf: -- 4.24.3 +- 4.24.4 lz4_c: - 1.9.3 macos_machine: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index d6672cf..6d633f3 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - vs2019 libprotobuf: -- 4.24.3 +- 4.24.4 lz4_c: - 1.9.3 snappy: From 8b5c0cdfd658e60b3ef61dccb72613ebb1ab61c5 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 10 Nov 2023 15:07:38 +0000 Subject: [PATCH 082/105] updated v1.9.2 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index fc9dacc..8cef4b6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.9.0" %} +{% set version = "1.9.2" %} package: name: orc @@ -6,7 +6,7 @@ package: source: url: https://archive.apache.org/dist/orc/orc-{{ version }}/orc-{{ version }}.tar.gz - sha256: 0dca8bbccdb2ee87e59ba964933436beebd02ea78c4134424828a8127fbc4faa + sha256: 7f46f2c184ecefd6791f1a53fb062286818bd8710c3f08b94dd3cac365e240ee patches: # ORC builds by default with -Werror but some dependencies omit warnings. # This deactivates -Werror @@ -17,7 +17,7 @@ source: - patches/0005-Check-for-protobuf-config-based-module.patch build: - number: 4 + number: 0 run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From 7b3dcd655e2d843c9726dc7cd5f6bb37a3c71913 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 10 Nov 2023 15:07:45 +0000 Subject: [PATCH 083/105] MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.28.0, and conda-forge-pinning 2023.11.10.07.51.14 --- .azure-pipelines/azure-pipelines-linux.yml | 3 +++ .azure-pipelines/azure-pipelines-osx.yml | 3 +++ .azure-pipelines/azure-pipelines-win.yml | 3 +++ .scripts/build_steps.sh | 17 +++++++++++++---- .scripts/run_docker_build.sh | 3 +++ .scripts/run_osx_build.sh | 15 +++++++++++---- .scripts/run_win_build.bat | 12 ++++++++++-- 7 files changed, 46 insertions(+), 10 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index fcb0974..2b93a12 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -33,6 +33,9 @@ jobs: - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 8032e96..f3ff063 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -20,6 +20,9 @@ jobs: # TODO: Fast finish on azure pipelines? - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export OSX_FORCE_SDK_DOWNLOAD="1" export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 82c5318..d609fcd 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -42,6 +42,9 @@ jobs: PYTHONUNBUFFERED: 1 CONFIG: $(CONFIG) CI: azure + flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt) + remote_url: $(Build.Repository.Uri) + sha: $(Build.SourceVersion) UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index bd9e671..064e539 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -28,13 +28,15 @@ conda-build: pkgs_dirs: - ${FEEDSTOCK_ROOT}/build_artifacts/pkg_cache - /opt/conda/pkgs +solver: libmamba CONDARC +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build conda-forge-ci-setup=4 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build conda-forge-ci-setup=4 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -55,6 +57,12 @@ if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" fi +if [[ "${sha:-}" == "" ]]; then + pushd ${FEEDSTOCK_ROOT} + sha=$(git rev-parse HEAD) + popd +fi + if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" @@ -66,9 +74,10 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ + --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 9236239..b70ef01 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -91,6 +91,9 @@ docker run ${DOCKER_RUN_ARGS} \ -e CPU_COUNT \ -e BUILD_WITH_CONDA_DEBUG \ -e BUILD_OUTPUT_ID \ + -e flow_run_id \ + -e remote_url \ + -e sha \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 870c49a..46ab346 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -22,11 +22,13 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base +export CONDA_SOLVER="libmamba" +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build conda-forge-ci-setup=4 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build conda-forge-ci-setup=4 @@ -45,6 +47,10 @@ else echo -e "\n\nNot mangling homebrew as we are not running in CI" fi +if [[ "${sha:-}" == "" ]]; then + sha=$(git rev-parse HEAD) +fi + echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup @@ -75,9 +81,10 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ + --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 07d3445..5b2b849 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -17,10 +17,14 @@ call :start_group "Configuring conda" :: Activate the base conda environment call activate base +:: Configure the solver +set "CONDA_SOLVER=libmamba" +if !errorlevel! neq 0 exit /b !errorlevel! +set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes +mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -41,11 +45,15 @@ if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" ) +if NOT [%flow_run_id%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" +) + call :end_group :: Build the recipe echo Building recipe -conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! :: Prepare some environment variables for the upload step From 0cdddf85fea792a3fe317bd30f38ce196fa03b5f Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 22 Jan 2024 12:48:29 +0000 Subject: [PATCH 084/105] Rebuild for libprotobuf 4.25.1 --- .ci_support/migrations/libprotobuf4251.yaml | 10 ++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libprotobuf4251.yaml diff --git a/.ci_support/migrations/libprotobuf4251.yaml b/.ci_support/migrations/libprotobuf4251.yaml new file mode 100644 index 0000000..39478f0 --- /dev/null +++ b/.ci_support/migrations/libprotobuf4251.yaml @@ -0,0 +1,10 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libprotobuf 4.25.1 + kind: version + migration_number: 1 +libgrpc: +- "1.60" +libprotobuf: +- 4.25.1 +migrator_ts: 1705841975.2201185 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8cef4b6..dc76440 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,7 +17,7 @@ source: - patches/0005-Check-for-protobuf-config-based-module.patch build: - number: 0 + number: 1 run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From 3cb3fd848c9f8d27a973df7fe942b3d711c06d68 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 22 Jan 2024 12:48:39 +0000 Subject: [PATCH 085/105] MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and conda-forge-pinning 2024.01.22.09.41.51 --- .ci_support/linux_64_.yaml | 2 +- .ci_support/linux_aarch64_.yaml | 2 +- .ci_support/linux_ppc64le_.yaml | 2 +- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .ci_support/win_64_.yaml | 2 +- .gitignore | 25 +++++++++++++++++++++++-- .scripts/build_steps.sh | 12 +++--------- .scripts/run_docker_build.sh | 6 ++++++ .scripts/run_osx_build.sh | 6 +++--- .scripts/run_win_build.bat | 8 +++++--- README.md | 2 +- 12 files changed, 47 insertions(+), 24 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 16a8670..4d66afa 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- 4.24.4 +- 4.25.1 lz4_c: - 1.9.3 snappy: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index ec264db..7342f9b 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -19,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- 4.24.4 +- 4.25.1 lz4_c: - 1.9.3 snappy: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index adf6dbb..b4a2de0 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- 4.24.4 +- 4.25.1 lz4_c: - 1.9.3 snappy: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index b5ebd49..e5a2dde 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '16' libprotobuf: -- 4.24.4 +- 4.25.1 lz4_c: - 1.9.3 macos_machine: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 1109249..66861d1 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '16' libprotobuf: -- 4.24.4 +- 4.25.1 lz4_c: - 1.9.3 macos_machine: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 6d633f3..4ebbc19 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - vs2019 libprotobuf: -- 4.24.4 +- 4.25.1 lz4_c: - 1.9.3 snappy: diff --git a/.gitignore b/.gitignore index c89ecb7..179afe5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,24 @@ -*.pyc +# User content belongs under recipe/. +# Feedstock configuration goes in `conda-forge.yml` +# Everything else is managed by the conda-smithy rerender process. +# Please do not modify + +# Ignore all files and folders in root +* +!/conda-forge.yml + +# Don't ignore any files/folders if the parent folder is 'un-ignored' +# This also avoids warnings when adding an already-checked file with an ignored parent. +!/**/ +# Don't ignore any files/folders recursively in the following folders +!/recipe/** +!/.ci_support/** -build_artifacts +# Since we ignore files/folders recursively, any folders inside +# build_artifacts gets ignored which trips some build systems. +# To avoid that we 'un-ignore' all files/folders recursively +# and only ignore the root build_artifacts folder. +!/build_artifacts/** +/build_artifacts + +*.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 064e539..beda247 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,9 +34,9 @@ CONDARC export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 + pip mamba conda-build boa conda-forge-ci-setup=4 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 + pip mamba conda-build boa conda-forge-ci-setup=4 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -57,12 +57,6 @@ if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" fi -if [[ "${sha:-}" == "" ]]; then - pushd ${FEEDSTOCK_ROOT} - sha=$(git rev-parse HEAD) - popd -fi - if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" @@ -74,7 +68,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index b70ef01..00f377a 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) fi +if [[ "${sha:-}" == "" ]]; then + pushd "${FEEDSTOCK_ROOT}" + sha=$(git rev-parse HEAD) + popd +fi + docker info # In order for the conda-build process in the container to write to the mounted diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 46ab346..9259eb9 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,9 +26,9 @@ export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 + pip mamba conda-build boa conda-forge-ci-setup=4 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 + pip mamba conda-build boa conda-forge-ci-setup=4 @@ -81,7 +81,7 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda build ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 5b2b849..48734de 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 -c conda-forge --strict-channel-priority --yes +mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=4 -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -42,7 +42,9 @@ if EXIST LICENSE.txt ( copy LICENSE.txt "recipe\\recipe-scripts-license.txt" ) if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + if [%CROSSCOMPILING_EMULATOR%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + ) ) if NOT [%flow_run_id%] == [] ( @@ -53,7 +55,7 @@ call :end_group :: Build the recipe echo Building recipe -conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! :: Prepare some environment variables for the upload step diff --git a/README.md b/README.md index 612733b..e2c08f9 100644 --- a/README.md +++ b/README.md @@ -151,7 +151,7 @@ available continuous integration services. Thanks to the awesome service provide [CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/), [Drone](https://cloud.drone.io/welcome), and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable packages to the -[conda-forge](https://anaconda.org/conda-forge) [Anaconda-Cloud](https://anaconda.org/) +[conda-forge](https://anaconda.org/conda-forge) [anaconda.org](https://anaconda.org/) channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance From db5b1a59e83ed8ed5d2be809bc3cf9c7bd8b9c01 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 22 Feb 2024 17:25:42 +0000 Subject: [PATCH 086/105] Rebuild for libabseil 20240116, libgrp 1.61, libprotobuf 4.25.2 --- ...il20240116_libgrpc161_libprotobuf4252.yaml | 22 +++++++++++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml diff --git a/.ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml b/.ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml new file mode 100644 index 0000000..08cd5a0 --- /dev/null +++ b/.ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml @@ -0,0 +1,22 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libabseil 20240116, libgrp 1.61, libprotobuf 4.25.2 + kind: version + migration_number: 1 + exclude: + - abseil-cpp + - grpc-cpp + - libprotobuf + # this shouldn't attempt to modify the python feedstocks + - protobuf +libabseil: +- "20240116" +libgrpc: +- "1.61" +libprotobuf: +- 4.25.2 +# already covered by libabseil20230802_libgrpc157_libprotobuf4234, +# which we cannot delete yet, but keep for clarity +MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] +- "10.13" # [osx and x86_64] +migrator_ts: 1705991934.9119136 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index dc76440..e8b2587 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,7 +17,7 @@ source: - patches/0005-Check-for-protobuf-config-based-module.patch build: - number: 1 + number: 2 run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From 60e9728d381b39f824b34bd7e23c473931c435ad Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 22 Feb 2024 17:25:50 +0000 Subject: [PATCH 087/105] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.30.4, and conda-forge-pinning 2024.02.22.13.57.26 --- .ci_support/linux_64_.yaml | 2 +- .ci_support/linux_aarch64_.yaml | 2 +- .ci_support/linux_ppc64le_.yaml | 2 +- .../migrations/libgrpc159_libprotobuf4244.yaml | 16 ---------------- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .ci_support/win_64_.yaml | 2 +- 7 files changed, 6 insertions(+), 22 deletions(-) delete mode 100644 .ci_support/migrations/libgrpc159_libprotobuf4244.yaml diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 4d66afa..25ad83a 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- 4.25.1 +- 4.25.2 lz4_c: - 1.9.3 snappy: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 7342f9b..adfd668 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -19,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- 4.25.1 +- 4.25.2 lz4_c: - 1.9.3 snappy: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index b4a2de0..454d0a9 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- 4.25.1 +- 4.25.2 lz4_c: - 1.9.3 snappy: diff --git a/.ci_support/migrations/libgrpc159_libprotobuf4244.yaml b/.ci_support/migrations/libgrpc159_libprotobuf4244.yaml deleted file mode 100644 index 8a51b6e..0000000 --- a/.ci_support/migrations/libgrpc159_libprotobuf4244.yaml +++ /dev/null @@ -1,16 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 - exclude: - # this shouldn't attempt to modify the python feedstocks - - protobuf -libgrpc: -- "1.59" -libprotobuf: -- 4.24.4 -# already covered by libabseil20230802_libgrpc157_libprotobuf4234, -# which we cannot delete yet, but keep for clarity -MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] -- "10.13" # [osx and x86_64] -migrator_ts: 1698833751.21557 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index e5a2dde..a5da402 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '16' libprotobuf: -- 4.25.1 +- 4.25.2 lz4_c: - 1.9.3 macos_machine: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 66861d1..7eb40ba 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '16' libprotobuf: -- 4.25.1 +- 4.25.2 lz4_c: - 1.9.3 macos_machine: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 4ebbc19..9cac5e2 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - vs2019 libprotobuf: -- 4.25.1 +- 4.25.2 lz4_c: - 1.9.3 snappy: From 479c29b4038177e68bd8fccc3c65b3d62794d124 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 6 Mar 2024 14:49:05 +0000 Subject: [PATCH 088/105] Rebuild for libprotobuf 4.25.3 --- .../libgrpc162_libprotobuf4253.yaml | 23 +++++++++++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libgrpc162_libprotobuf4253.yaml diff --git a/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml b/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml new file mode 100644 index 0000000..16b401a --- /dev/null +++ b/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml @@ -0,0 +1,23 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libprotobuf 4.25.3 + kind: version + migration_number: 1 + exclude: + - abseil-cpp + - grpc-cpp + - libprotobuf + - protobuf +libgrpc: +- "1.62" +libprotobuf: +- 4.25.3 +# keep abseil bump from libabseil20240116_libgrpc161_libprotobuf4252; +# this ensures that this migration applies also without the previous one +libabseil: +- "20240116" +# already covered by libabseil20230802_libgrpc157_libprotobuf4234, +# which we cannot delete yet, but keep for clarity +MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] +- "10.13" # [osx and x86_64] +migrator_ts: 1709522594.9193177 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e8b2587..92db78a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,7 +17,7 @@ source: - patches/0005-Check-for-protobuf-config-based-module.patch build: - number: 2 + number: 3 run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From 0adf82d6152407549515bde0d92898f133979ba6 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 6 Mar 2024 14:49:18 +0000 Subject: [PATCH 089/105] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.31.1, and conda-forge-pinning 2024.03.06.12.50.32 --- .ci_support/linux_64_.yaml | 2 +- .ci_support/linux_aarch64_.yaml | 2 +- .ci_support/linux_ppc64le_.yaml | 2 +- .ci_support/migrations/libprotobuf4251.yaml | 10 ---------- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .ci_support/win_64_.yaml | 2 +- .scripts/build_steps.sh | 6 +++--- .scripts/run_osx_build.sh | 6 +++--- .scripts/run_win_build.bat | 4 ++-- build-locally.py | 5 +++-- 11 files changed, 17 insertions(+), 26 deletions(-) delete mode 100644 .ci_support/migrations/libprotobuf4251.yaml diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 25ad83a..a13948e 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- 4.25.2 +- 4.25.3 lz4_c: - 1.9.3 snappy: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index adfd668..bafb231 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -19,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- 4.25.2 +- 4.25.3 lz4_c: - 1.9.3 snappy: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 454d0a9..40cdb7a 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- 4.25.2 +- 4.25.3 lz4_c: - 1.9.3 snappy: diff --git a/.ci_support/migrations/libprotobuf4251.yaml b/.ci_support/migrations/libprotobuf4251.yaml deleted file mode 100644 index 39478f0..0000000 --- a/.ci_support/migrations/libprotobuf4251.yaml +++ /dev/null @@ -1,10 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libprotobuf 4.25.1 - kind: version - migration_number: 1 -libgrpc: -- "1.60" -libprotobuf: -- 4.25.1 -migrator_ts: 1705841975.2201185 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index a5da402..7213bdb 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '16' libprotobuf: -- 4.25.2 +- 4.25.3 lz4_c: - 1.9.3 macos_machine: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 7eb40ba..f9d3bac 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '16' libprotobuf: -- 4.25.2 +- 4.25.3 lz4_c: - 1.9.3 macos_machine: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 9cac5e2..16be130 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - vs2019 libprotobuf: -- 4.25.2 +- 4.25.3 lz4_c: - 1.9.3 snappy: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index beda247..9121002 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,9 +34,9 @@ CONDARC export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -68,7 +68,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 9259eb9..16daa69 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,9 +26,9 @@ export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" @@ -81,7 +81,7 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 48734de..f801cf4 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=4 -c conda-forge --strict-channel-priority --yes +mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -55,7 +55,7 @@ call :end_group :: Build the recipe echo Building recipe -conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! :: Prepare some environment variables for the upload step diff --git a/build-locally.py b/build-locally.py index 3f4b7a7..e0d408d 100755 --- a/build-locally.py +++ b/build-locally.py @@ -64,8 +64,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) From 7182c34644f19c7d5369e04dc829b0127cc8002d Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 8 Mar 2024 22:12:47 +0000 Subject: [PATCH 090/105] updated v2.0.0 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 92db78a..52703cd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.9.2" %} +{% set version = "2.0.0" %} package: name: orc @@ -6,7 +6,7 @@ package: source: url: https://archive.apache.org/dist/orc/orc-{{ version }}/orc-{{ version }}.tar.gz - sha256: 7f46f2c184ecefd6791f1a53fb062286818bd8710c3f08b94dd3cac365e240ee + sha256: 9107730919c29eb39efaff1b9e36166634d1d4d9477e5fee76bfd6a8fec317df patches: # ORC builds by default with -Werror but some dependencies omit warnings. # This deactivates -Werror @@ -17,7 +17,7 @@ source: - patches/0005-Check-for-protobuf-config-based-module.patch build: - number: 3 + number: 0 run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From 8a461869ebb2f72dc94b9890674b2489d0da6b48 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 11 Mar 2024 16:40:08 +0100 Subject: [PATCH 091/105] rebase patches --- ...vate-aggressive-failures-on-warnings.patch | 9 ++--- ...to-be-a-static-library-let-end-user-.patch | 7 +--- ...-more-hints-for-libraries-on-Windows.patch | 37 +++++++++---------- .../0004-don-t-force-lib-destination.patch | 13 +++---- ...eck-for-protobuf-config-based-module.patch | 7 +--- 5 files changed, 29 insertions(+), 44 deletions(-) diff --git a/recipe/patches/0001-Deactivate-aggressive-failures-on-warnings.patch b/recipe/patches/0001-Deactivate-aggressive-failures-on-warnings.patch index 275df9c..aa3123e 100644 --- a/recipe/patches/0001-Deactivate-aggressive-failures-on-warnings.patch +++ b/recipe/patches/0001-Deactivate-aggressive-failures-on-warnings.patch @@ -1,4 +1,4 @@ -From c12e690560c91b7a1593b57a8b390696d73296db Mon Sep 17 00:00:00 2001 +From 651672c8034c07c410aebf0e7667a6a77a31a8d7 Mon Sep 17 00:00:00 2001 From: "Korn, Uwe" Date: Tue, 19 Mar 2019 11:16:02 +0100 Subject: [PATCH 1/5] Deactivate aggressive failures on warnings @@ -8,10 +8,10 @@ Subject: [PATCH 1/5] Deactivate aggressive failures on warnings 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index dcd4e7fd1..4fbda3544 100644 +index 47a6d66..47832b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -177,6 +177,8 @@ else () +@@ -160,6 +160,8 @@ else () add_compile_definitions(ENABLE_METRICS=0) endif () @@ -20,6 +20,3 @@ index dcd4e7fd1..4fbda3544 100644 enable_testing() INCLUDE(CheckSourceCompiles) --- -2.41.0 - diff --git a/recipe/patches/0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch b/recipe/patches/0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch index f4c982f..bf64623 100644 --- a/recipe/patches/0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch +++ b/recipe/patches/0002-Don-t-force-orc-to-be-a-static-library-let-end-user-.patch @@ -1,4 +1,4 @@ -From fdf87a2f344a25e0e92a174fc3acbccc200b9f11 Mon Sep 17 00:00:00 2001 +From 43d34904ff88211396be6a3572718c3d3bef6cb9 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Fri, 25 Sep 2020 14:49:59 -0400 Subject: [PATCH 2/5] Don't force orc to be a static library, let end user @@ -9,7 +9,7 @@ Subject: [PATCH 2/5] Don't force orc to be a static library, let end user 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt -index 972f2fc03..898f223f4 100644 +index 33ad584..f5a806a 100644 --- a/c++/src/CMakeLists.txt +++ b/c++/src/CMakeLists.txt @@ -206,7 +206,7 @@ if(BUILD_ENABLE_AVX512) @@ -21,6 +21,3 @@ index 972f2fc03..898f223f4 100644 target_link_libraries (orc orc::protobuf --- -2.41.0 - diff --git a/recipe/patches/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch b/recipe/patches/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch index 5fb2a47..4de0491 100644 --- a/recipe/patches/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch +++ b/recipe/patches/0003-CMake-Add-more-hints-for-libraries-on-Windows.patch @@ -1,4 +1,4 @@ -From b449aaf29458c56777387f50217c45747626675f Mon Sep 17 00:00:00 2001 +From d65b2bc5a72aa975acb84cafca4ecff9e859fdc4 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sat, 4 Feb 2023 20:50:40 +0000 Subject: [PATCH 3/5] CMake: Add more hints for libraries on Windows @@ -9,7 +9,7 @@ Subject: [PATCH 3/5] CMake: Add more hints for libraries on Windows 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake_modules/FindLZ4.cmake b/cmake_modules/FindLZ4.cmake -index b1557f496..8061dda38 100644 +index b1557f4..8061dda 100644 --- a/cmake_modules/FindLZ4.cmake +++ b/cmake_modules/FindLZ4.cmake @@ -33,7 +33,7 @@ find_path (LZ4_INCLUDE_DIR lz4.h HINTS @@ -22,27 +22,24 @@ index b1557f496..8061dda38 100644 PATH_SUFFIXES "lib" "lib64") diff --git a/cmake_modules/FindProtobuf.cmake b/cmake_modules/FindProtobuf.cmake -index c52f3131d..8af45bd92 100644 +index cca7c8b..5a1a9d0 100644 --- a/cmake_modules/FindProtobuf.cmake +++ b/cmake_modules/FindProtobuf.cmake -@@ -42,7 +42,7 @@ find_path (PROTOBUF_INCLUDE_DIR google/protobuf/io/coded_stream.h HINTS - NO_DEFAULT_PATH - PATH_SUFFIXES "include") +@@ -63,7 +63,7 @@ else() + NO_DEFAULT_PATH + PATH_SUFFIXES "include") --find_library (PROTOBUF_LIBRARY NAMES protobuf HINTS -+find_library (PROTOBUF_LIBRARY NAMES protobuf libprotobuf HINTS - ${_protobuf_path} - PATH_SUFFIXES "lib") +- find_library (PROTOBUF_LIBRARY NAMES protobuf HINTS ++ find_library (PROTOBUF_LIBRARY NAMES protobuf libprotobuf HINTS + ${_protobuf_path} + PATH_SUFFIXES "lib") -@@ -50,7 +50,7 @@ find_library (PROTOBUF_STATIC_LIB NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}protobuf${ - ${_protobuf_path} - PATH_SUFFIXES "lib") +@@ -71,7 +71,7 @@ else() + ${_protobuf_path} + PATH_SUFFIXES "lib") --find_library (PROTOC_LIBRARY NAMES protoc HINTS -+find_library (PROTOC_LIBRARY NAMES protoc libprotoc HINTS - ${_protobuf_path} - PATH_SUFFIXES "lib") +- find_library (PROTOC_LIBRARY NAMES protoc HINTS ++ find_library (PROTOC_LIBRARY NAMES protoc libprotoc HINTS + ${_protobuf_path} + PATH_SUFFIXES "lib") --- -2.41.0 - diff --git a/recipe/patches/0004-don-t-force-lib-destination.patch b/recipe/patches/0004-don-t-force-lib-destination.patch index f9d3329..74dfaa4 100644 --- a/recipe/patches/0004-don-t-force-lib-destination.patch +++ b/recipe/patches/0004-don-t-force-lib-destination.patch @@ -1,4 +1,4 @@ -From 224455b380dc836ad5cac5ec367aced98345474d Mon Sep 17 00:00:00 2001 +From 699586d51ca326ce8d265dfd986439f70989bea3 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 5 Feb 2023 15:32:08 +1100 Subject: [PATCH 4/5] don't force lib destination @@ -8,15 +8,12 @@ Subject: [PATCH 4/5] don't force lib destination 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt -index 898f223f4..b0eed1c7c 100644 +index f5a806a..d6dcca0 100644 --- a/c++/src/CMakeLists.txt +++ b/c++/src/CMakeLists.txt -@@ -217,4 +217,4 @@ target_link_libraries (orc - ${LIBHDFSPP_LIBRARIES} - ) +@@ -219,4 +219,4 @@ target_link_libraries (orc + + add_dependencies(orc orc-format_ep) -install(TARGETS orc DESTINATION lib) +install(TARGETS orc) --- -2.41.0 - diff --git a/recipe/patches/0005-Check-for-protobuf-config-based-module.patch b/recipe/patches/0005-Check-for-protobuf-config-based-module.patch index f32f60f..a0d58c0 100644 --- a/recipe/patches/0005-Check-for-protobuf-config-based-module.patch +++ b/recipe/patches/0005-Check-for-protobuf-config-based-module.patch @@ -1,4 +1,4 @@ -From 85e312956a4868c96fd44c19d77b898519838b93 Mon Sep 17 00:00:00 2001 +From e6284a57dff236e8617f5df8bfc7d2ccba951551 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sun, 4 Jun 2023 10:35:32 +0100 Subject: [PATCH 5/5] Check for protobuf config based module @@ -8,7 +8,7 @@ Subject: [PATCH 5/5] Check for protobuf config based module 1 file changed, 18 insertions(+) diff --git a/cmake_modules/FindProtobuf.cmake b/cmake_modules/FindProtobuf.cmake -index 8af45bd92..ecbb7c933 100644 +index 5a1a9d0..9fdc98c 100644 --- a/cmake_modules/FindProtobuf.cmake +++ b/cmake_modules/FindProtobuf.cmake @@ -26,6 +26,24 @@ @@ -36,6 +36,3 @@ index 8af45bd92..ecbb7c933 100644 if( NOT "${PROTOBUF_HOME}" STREQUAL "") file (TO_CMAKE_PATH "${PROTOBUF_HOME}" _protobuf_path) endif() --- -2.41.0 - From ee5bfee69424dc3cdb1827ec2230c8d06164f0c6 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 11 Mar 2024 19:53:00 +0100 Subject: [PATCH 092/105] Set _LIBCPP_DISABLE_AVAILABILITY on osx --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index f1608e5..890fb28 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -16,7 +16,7 @@ if [[ ${HOST} =~ .*darwin.* ]]; then _CMAKE_EXTRA_CONFIG+=(-DCMAKE_AR=${AR}) _CMAKE_EXTRA_CONFIG+=(-DCMAKE_RANLIB=${RANLIB}) _CMAKE_EXTRA_CONFIG+=(-DCMAKE_LINKER=${LD}) - CXXFLAGS="${CXXFLAGS} -DPROTOBUF_USE_DLLS" + CXXFLAGS="${CXXFLAGS} -DPROTOBUF_USE_DLLS -D_LIBCPP_DISABLE_AVAILABILITY" fi if [[ ${HOST} =~ .*linux.* ]]; then # I hate you so much CMake. From ae644b3e0fd0f760e45041a813e76684c8453d8f Mon Sep 17 00:00:00 2001 From: "conda-forge-curator[bot]" <79913779+conda-forge-curator[bot]@users.noreply.github.com> Date: Fri, 15 Mar 2024 20:14:53 +0000 Subject: [PATCH 093/105] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration CondaForgeYAMLTest --- conda-forge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-forge.yml b/conda-forge.yml index 092b9fd..2c603b9 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -11,4 +11,4 @@ github: provider: linux_aarch64: default linux_ppc64le: default -test_on_native_only: true +test: native_and_emulated From 6f2a9974f7ddcb5c0edf8b2affc98e4c72d87c8a Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 8 Apr 2024 21:55:55 +0000 Subject: [PATCH 094/105] Rebuild for snappy120 --- .ci_support/migrations/snappy120.yaml | 7 +++++++ recipe/meta.yaml | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/snappy120.yaml diff --git a/.ci_support/migrations/snappy120.yaml b/.ci_support/migrations/snappy120.yaml new file mode 100644 index 0000000..10e1f14 --- /dev/null +++ b/.ci_support/migrations/snappy120.yaml @@ -0,0 +1,7 @@ +migrator_ts: 1712592149 +__migrator: + kind: version + migration_number: 1 + bump_number: 1 +snappy: + - 1.2 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 52703cd..ccbcb5b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,13 +17,14 @@ source: - patches/0005-Check-for-protobuf-config-based-module.patch build: - number: 0 + number: 1 run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} requirements: build: - {{ compiler('c') }} + - {{ stdlib("c") }} - {{ compiler('cxx') }} - ninja # [unix] # `protoc` is also used for building From db6ca98a19cee4f12d7c7b75ca75b24942ece458 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 8 Apr 2024 21:56:08 +0000 Subject: [PATCH 095/105] MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.34.1, and conda-forge-pinning 2024.04.08.16.26.39 --- .azure-pipelines/azure-pipelines-linux.yml | 1 + .azure-pipelines/azure-pipelines-osx.yml | 1 + .ci_support/linux_64_.yaml | 8 +++++++- .ci_support/linux_aarch64_.yaml | 8 +++++++- .ci_support/linux_ppc64le_.yaml | 8 +++++++- .ci_support/osx_64_.yaml | 6 +++++- .ci_support/osx_arm64_.yaml | 6 +++++- .ci_support/win_64_.yaml | 4 +++- .scripts/build_steps.sh | 2 +- .scripts/run_osx_build.sh | 2 +- .scripts/run_win_build.bat | 2 +- azure-pipelines.yml | 4 ++-- 12 files changed, 41 insertions(+), 11 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 2b93a12..aef462c 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -21,6 +21,7 @@ jobs: UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 + variables: {} steps: # configure qemu binfmt-misc running. This allows us to run docker containers diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index f3ff063..730a626 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -15,6 +15,7 @@ jobs: CONFIG: osx_arm64_ UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 + variables: {} steps: # TODO: Fast finish on azure pipelines? diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index a13948e..c960737 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: @@ -19,12 +23,14 @@ libprotobuf: lz4_c: - 1.9.3 snappy: -- '1' +- '1.2' target_platform: - linux-64 zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name zlib: - '1.2' zstd: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index bafb231..0dce11f 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -23,12 +27,14 @@ libprotobuf: lz4_c: - 1.9.3 snappy: -- '1' +- '1.2' target_platform: - linux-aarch64 zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name zlib: - '1.2' zstd: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 40cdb7a..a4b67e8 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -19,12 +23,14 @@ libprotobuf: lz4_c: - 1.9.3 snappy: -- '1' +- '1.2' target_platform: - linux-ppc64le zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name zlib: - '1.2' zstd: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 7213bdb..026ebf6 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -19,7 +23,7 @@ lz4_c: macos_machine: - x86_64-apple-darwin13.4.0 snappy: -- '1' +- '1.2' target_platform: - osx-64 zip_keys: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index f9d3bac..588e67c 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -19,7 +23,7 @@ lz4_c: macos_machine: - arm64-apple-darwin20.0.0 snappy: -- '1' +- '1.2' target_platform: - osx-arm64 zip_keys: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 16be130..6965904 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: @@ -11,7 +13,7 @@ libprotobuf: lz4_c: - 1.9.3 snappy: -- '1' +- '1.2' target_platform: - win-64 zlib: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 9121002..899ba03 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -68,7 +68,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 16daa69..07dff21 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -81,7 +81,7 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda build ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda-build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index f801cf4..6d54697 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -55,7 +55,7 @@ call :end_group :: Build the recipe echo Building recipe -conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! :: Prepare some environment variables for the upload step diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6b346f5..e5306da 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file From 0cfab48e0f9cfeee3b66c010792ae3826e5db3cd Mon Sep 17 00:00:00 2001 From: "conda-forge-curator[bot]" <79913779+conda-forge-curator[bot]@users.noreply.github.com> Date: Sun, 12 May 2024 17:53:01 +0000 Subject: [PATCH 096/105] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration CondaForgeAutomergeUpdate --- .github/workflows/automerge.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index da1368a..0535f6a 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -9,8 +9,6 @@ jobs: runs-on: ubuntu-latest name: automerge steps: - - name: checkout - uses: actions/checkout@v3 - name: automerge-action id: automerge-action uses: conda-forge/automerge-action@main From 6913e039f74ec08e14b3c46b88e1ae21234170cd Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 15 May 2024 10:56:50 +0000 Subject: [PATCH 097/105] updated v2.0.1 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ccbcb5b..e91f674 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "2.0.0" %} +{% set version = "2.0.1" %} package: name: orc @@ -6,7 +6,7 @@ package: source: url: https://archive.apache.org/dist/orc/orc-{{ version }}/orc-{{ version }}.tar.gz - sha256: 9107730919c29eb39efaff1b9e36166634d1d4d9477e5fee76bfd6a8fec317df + sha256: 1ffac0228aa83f04a1b1cf2788a3af5953e82587ae3a77c41900e99f2557132d patches: # ORC builds by default with -Werror but some dependencies omit warnings. # This deactivates -Werror @@ -17,7 +17,7 @@ source: - patches/0005-Check-for-protobuf-config-based-module.patch build: - number: 1 + number: 0 run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} From 9d0d71c40497a1054487f6ada5225d3b4ba2859d Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 15 May 2024 10:57:49 +0000 Subject: [PATCH 098/105] MNT: Re-rendered with conda-build 24.5.0, conda-smithy 3.35.1, and conda-forge-pinning 2024.05.15.08.40.24 --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- ...il20230802_libgrpc157_libprotobuf4234.yaml | 13 ----------- ...il20240116_libgrpc161_libprotobuf4252.yaml | 22 ------------------ .../libgrpc162_libprotobuf4253.yaml | 23 ------------------- 4 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 .ci_support/migrations/libabseil20230802_libgrpc157_libprotobuf4234.yaml delete mode 100644 .ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml delete mode 100644 .ci_support/migrations/libgrpc162_libprotobuf4253.yaml diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 730a626..7708e23 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: osx_64_: diff --git a/.ci_support/migrations/libabseil20230802_libgrpc157_libprotobuf4234.yaml b/.ci_support/migrations/libabseil20230802_libgrpc157_libprotobuf4234.yaml deleted file mode 100644 index 3781ea0..0000000 --- a/.ci_support/migrations/libabseil20230802_libgrpc157_libprotobuf4234.yaml +++ /dev/null @@ -1,13 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libabseil: -- 20230802 -libgrpc: -- "1.57" -libprotobuf: -- 4.23.4 -MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] -- "10.13" # [osx and x86_64] -migrator_ts: 1692632590.658328 diff --git a/.ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml b/.ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml deleted file mode 100644 index 08cd5a0..0000000 --- a/.ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml +++ /dev/null @@ -1,22 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libabseil 20240116, libgrp 1.61, libprotobuf 4.25.2 - kind: version - migration_number: 1 - exclude: - - abseil-cpp - - grpc-cpp - - libprotobuf - # this shouldn't attempt to modify the python feedstocks - - protobuf -libabseil: -- "20240116" -libgrpc: -- "1.61" -libprotobuf: -- 4.25.2 -# already covered by libabseil20230802_libgrpc157_libprotobuf4234, -# which we cannot delete yet, but keep for clarity -MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] -- "10.13" # [osx and x86_64] -migrator_ts: 1705991934.9119136 diff --git a/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml b/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml deleted file mode 100644 index 16b401a..0000000 --- a/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml +++ /dev/null @@ -1,23 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libprotobuf 4.25.3 - kind: version - migration_number: 1 - exclude: - - abseil-cpp - - grpc-cpp - - libprotobuf - - protobuf -libgrpc: -- "1.62" -libprotobuf: -- 4.25.3 -# keep abseil bump from libabseil20240116_libgrpc161_libprotobuf4252; -# this ensures that this migration applies also without the previous one -libabseil: -- "20240116" -# already covered by libabseil20230802_libgrpc157_libprotobuf4234, -# which we cannot delete yet, but keep for clarity -MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] -- "10.13" # [osx and x86_64] -migrator_ts: 1709522594.9193177 From abe8eeb5b4e7c589d0676216c1c9c2a8d76744ba Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 27 May 2024 11:01:55 +1100 Subject: [PATCH 099/105] add runtime dependence on tzdata --- recipe/meta.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e91f674..7d0d10a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,7 +17,7 @@ source: - patches/0005-Check-for-protobuf-config-based-module.patch build: - number: 0 + number: 1 run_exports: - {{ pin_subpackage("orc", max_pin="x.x.x") }} @@ -36,6 +36,9 @@ requirements: - libprotobuf - lz4-c - zstd + run: + # orc >=2.0.1 will prefer $CONDA_PREFIX/share/zoneinfo for tzdb + - tzdata test: commands: From 441ba22962105c8f1f83ccd299269e9b6b5b429c Mon Sep 17 00:00:00 2001 From: Charles Bousseau Date: Mon, 27 May 2024 16:14:34 -0400 Subject: [PATCH 100/105] s390x ld64 missing dso --- recipe/meta.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 639f678..0a15ca7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -19,7 +19,9 @@ source: build: number: 0 run_exports: - - {{ pin_subpackage("orc", max_pin="x.x.x") }} + - {{ pin_subpackage("orc", max_pin="x.x.x") }} + missing_dso_whitelist: # [s390x] + - '$RPATH/ld64.so.1' # [s390x] requirements: build: From 0b3187d3ef79df0d01933108cc053a046ee90b0d Mon Sep 17 00:00:00 2001 From: Charles Bousseau Date: Mon, 27 May 2024 16:22:10 -0400 Subject: [PATCH 101/105] vs2019 on windows --- recipe/conda_build_config.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index b7a4454..4ec4900 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,3 +1,4 @@ -# This needs to be removed after the pinning of libprotobuf has been adjusted. -libprotobuf: -- 3.20 +cxx_compiler: # [win] + - 'vs2019' # [win] +c_compiler: # [win] + - 'vs2019' # [win] \ No newline at end of file From 5df93efc353eb1945b6f07a17b5a9baa04df9c66 Mon Sep 17 00:00:00 2001 From: Charles Bousseau Date: Mon, 27 May 2024 16:24:40 -0400 Subject: [PATCH 102/105] min osx 10.15 --- recipe/conda_build_config.yaml | 11 ++++++++++- recipe/meta.yaml | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 4ec4900..1734c50 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,4 +1,13 @@ cxx_compiler: # [win] - 'vs2019' # [win] c_compiler: # [win] - - 'vs2019' # [win] \ No newline at end of file + - 'vs2019' # [win] + +# abseil (use through protobuf includes) now only support MacOS >=10.15, see +# https://github.com/abseil/abseil-cpp#support +MACOSX_SDK_VERSION: # [osx and x86_64] + - "10.15" # [osx and x86_64] +MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] + - "10.15" # [osx and x86_64] +CONDA_BUILD_SYSROOT: # [osx and x86_64] + - /opt/MacOSX10.15.sdk # [osx and x86_64] \ No newline at end of file diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0a15ca7..45b5898 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -42,6 +42,7 @@ requirements: run: # orc >=2.0.1 will prefer $CONDA_PREFIX/share/zoneinfo for tzdb - tzdata + - __osx >={{ MACOSX_DEPLOYMENT_TARGET }} # [osx and x86_64] test: commands: From dcfc0c7dd0b43697f5182a2c46169992aa3c8aea Mon Sep 17 00:00:00 2001 From: Charles Bousseau Date: Mon, 27 May 2024 17:04:53 -0400 Subject: [PATCH 103/105] add libabseil for win, add run --- recipe/bld.bat | 2 +- recipe/build.sh | 1 + recipe/meta.yaml | 10 +++++++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 3b74c14..2bedb49 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -22,6 +22,7 @@ cmake %CMAKE_ARGS% ^ -DBUILD_SHARED_LIBS=ON ^ -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON ^ -DBUILD_TOOLS=OFF ^ + -DINSTALL_VENDORED_LIBS=OFF ^ -DORC_PREFER_STATIC_PROTOBUF=OFF ^ -DORC_PREFER_STATIC_SNAPPY=OFF ^ -DORC_PREFER_STATIC_LZ4=OFF ^ @@ -31,7 +32,6 @@ cmake %CMAKE_ARGS% ^ -DBUILD_JAVA=OFF ^ -DBUILD_LIBHDFSPP=OFF ^ -DBUILD_CPP_TESTS=OFF ^ - -DBUILD_TOOLS=OFF ^ -GNinja .. if errorlevel 1 exit /b 1 ninja -v diff --git a/recipe/build.sh b/recipe/build.sh index dcc3a39..d5ef17d 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -47,6 +47,7 @@ cmake ${CMAKE_ARGS} \ -DSNAPPY_HOME=$PREFIX \ -DBUILD_LIBHDFSPP=NO \ -DBUILD_CPP_TESTS=OFF \ + -DINSTALL_VENDORED_LIBS=OFF \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DCMAKE_C_COMPILER=$(type -p ${CC}) \ -DCMAKE_CXX_COMPILER=$(type -p ${CXX}) \ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 45b5898..d50a6e0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -37,12 +37,20 @@ requirements: - zlib {{ zlib }} - snappy 1.1.10 - libprotobuf 4.25.3 + - libabseil 20240116.2 # [win] linked with orc.dll through libprotobuf dep. - lz4-c 1.9.4 - zstd {{ zstd }} run: + # through run exports + - zlib + - snappy + - libprotobuf + - libabseil # [win] + - lz4-c + - zstd + - __osx >={{ MACOSX_DEPLOYMENT_TARGET }} # [osx and x86_64] # orc >=2.0.1 will prefer $CONDA_PREFIX/share/zoneinfo for tzdb - tzdata - - __osx >={{ MACOSX_DEPLOYMENT_TARGET }} # [osx and x86_64] test: commands: From 17b21b6428d3e1abb49a8dbd3113902f56e47c73 Mon Sep 17 00:00:00 2001 From: Charles Bousseau Date: Tue, 28 May 2024 14:28:50 -0400 Subject: [PATCH 104/105] cxx 17 --- recipe/bld.bat | 1 + recipe/build.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index 2bedb49..33d6f7b 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -8,6 +8,7 @@ set CXXFLAGS=-DPROTOBUF_USE_DLLS %CXXFLAGS% cmake %CMAKE_ARGS% ^ -DCMAKE_BUILD_TYPE=Release ^ + -DCMAKE_CXX_STANDARD=17 ^ -DCMAKE_POLICY_DEFAULT_CMP0074=NEW ^ -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^ -DCMAKE_FIND_ROOT_PATH=%PREFIX% ^ diff --git a/recipe/build.sh b/recipe/build.sh index d5ef17d..20a366e 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -29,6 +29,7 @@ CPPFLAGS="${CPPFLAGS} -Wl,-rpath,$PREFIX/lib" cmake ${CMAKE_ARGS} \ -DCMAKE_PREFIX_PATH=$PREFIX \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_STANDARD=17 \ -DBUILD_SHARED_LIBS=ON \ -DORC_PREFER_STATIC_PROTOBUF=OFF \ -DORC_PREFER_STATIC_SNAPPY=OFF \ From bd0e747dfcccb05a3f34a57e65c45b3eea9b9365 Mon Sep 17 00:00:00 2001 From: Charles Bousseau Date: Thu, 30 May 2024 17:15:39 -0400 Subject: [PATCH 105/105] address comments --- recipe/build.sh | 5 ++--- recipe/conda_build_config.yaml | 5 ----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 20a366e..8535f01 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -16,16 +16,15 @@ if [[ ${HOST} =~ .*darwin.* ]]; then _CMAKE_EXTRA_CONFIG+=(-DCMAKE_AR=${AR}) _CMAKE_EXTRA_CONFIG+=(-DCMAKE_RANLIB=${RANLIB}) _CMAKE_EXTRA_CONFIG+=(-DCMAKE_LINKER=${LD}) - CXXFLAGS="${CXXFLAGS} -DPROTOBUF_USE_DLLS -D_LIBCPP_DISABLE_AVAILABILITY" + CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY" fi if [[ ${HOST} =~ .*linux.* ]]; then # I hate you so much CMake. LIBPTHREAD=$(find ${PREFIX} -name "libpthread.so") _CMAKE_EXTRA_CONFIG+=(-DPTHREAD_LIBRARY=${LIBPTHREAD}) + export LDFLAGS="${LDFLAGS} -Wl,-rpath,$PREFIX/lib" fi -CPPFLAGS="${CPPFLAGS} -Wl,-rpath,$PREFIX/lib" - cmake ${CMAKE_ARGS} \ -DCMAKE_PREFIX_PATH=$PREFIX \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 1734c50..a9b9e17 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,8 +1,3 @@ -cxx_compiler: # [win] - - 'vs2019' # [win] -c_compiler: # [win] - - 'vs2019' # [win] - # abseil (use through protobuf includes) now only support MacOS >=10.15, see # https://github.com/abseil/abseil-cpp#support MACOSX_SDK_VERSION: # [osx and x86_64]
VariantStatus
linux_64_libprotobuf3.21linux_64 - variant + variant
linux_64_libprotobuf4.23.3linux_aarch64 - variant + variant
linux_aarch64_libprotobuf3.21linux_ppc64le - variant + variant
linux_aarch64_libprotobuf4.23.3osx_64 - variant + variant
linux_ppc64le_libprotobuf3.21osx_arm64 - variant + variant
linux_ppc64le_libprotobuf4.23.3win_64 - variant - -
osx_64_libprotobuf3.21 - - variant - -
osx_64_libprotobuf4.23.3 - - variant - -
osx_arm64_libprotobuf3.21 - - variant - -
osx_arm64_libprotobuf4.23.3 - - variant - -
win_64_libprotobuf3.21 - - variant - -
win_64_libprotobuf4.23.3 - - variant + variant