From 431f42ac5a8dc99e891d4dcde14b900c7eedc080 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 9 Mar 2023 03:28:43 +0000 Subject: [PATCH 1/3] updated v1.1.10 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a860813..65c3808 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.1.9" %} +{% set version = "1.1.10" %} package: name: snappy @@ -6,7 +6,7 @@ package: source: url: https://github.com/google/snappy/archive/{{ version }}.tar.gz - sha256: 75c1fbb3d618dd3a0483bff0e26d0a92b495bbe5059c8b4f1c962b478b6e06e7 + sha256: 49d831bffcc5f3d01482340fe5af59852ca2fe76c3e05df0e67203ebbe0f1d90 patches: # Name the static library snappy_static.lib on windows, to distinguish from # the dynamic library, since they have the same suffix there. @@ -17,7 +17,7 @@ source: - 0001-cmake-add-option-to-enable-disable-RTTI.patch build: - number: 2 + number: 0 ignore_run_exports_from: - lz4-c run_exports: From 7969a8fea90b48df331b20efe4e1d05d351dc0d6 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 9 Mar 2023 03:28:57 +0000 Subject: [PATCH 2/3] MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.23.0, and conda-forge-pinning 2023.03.09.00.59.00 --- .azure-pipelines/azure-pipelines-win.yml | 8 ++++++-- .ci_support/linux_64_.yaml | 4 ++-- .ci_support/linux_aarch64_.yaml | 4 ++-- .ci_support/linux_ppc64le_.yaml | 4 ++-- .scripts/build_steps.sh | 4 ++-- .scripts/run_osx_build.sh | 4 ++-- README.md | 8 ++++---- 7 files changed, 20 insertions(+), 16 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 13e526a..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_: @@ -14,6 +14,7 @@ jobs: timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_TEMP: D:\\tmp steps: - task: PythonScript@0 @@ -35,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 @@ -72,6 +73,9 @@ jobs: - 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 diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 3c9440c..0df857f 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 lz4_c: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index a3b059c..ca3fc8d 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 lz4_c: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 340bc49..4b1146f 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 lz4_c: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 71a4242..595f8b5 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 caa788e..f169576 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 6388599..ddb7239 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -About snappy -============ +About snappy-feedstock +====================== + +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/snappy-feedstock/blob/main/LICENSE.txt) Home: https://github.com/google/snappy Package license: BSD-3-Clause -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/snappy-feedstock/blob/main/LICENSE.txt) - Summary: A fast compressor/decompressor Current build status From 737e0dfeb241ce08bf03dc70fd035260cf528ed8 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sat, 11 Mar 2023 12:15:40 +0100 Subject: [PATCH 3/3] Omit Werror --- .../0001-Omit-Werror-during-compilation.patch | 30 +++++++++++++++++++ recipe/meta.yaml | 1 + 2 files changed, 31 insertions(+) create mode 100644 recipe/0001-Omit-Werror-during-compilation.patch diff --git a/recipe/0001-Omit-Werror-during-compilation.patch b/recipe/0001-Omit-Werror-during-compilation.patch new file mode 100644 index 0000000..4e843cc --- /dev/null +++ b/recipe/0001-Omit-Werror-during-compilation.patch @@ -0,0 +1,30 @@ +From 953b72083de19c04c6eb81b18bbe3e0ad1b29393 Mon Sep 17 00:00:00 2001 +From: "Uwe L. Korn" +Date: Sat, 11 Mar 2023 12:13:29 +0100 +Subject: [PATCH] Omit Werror during compilation + +--- + CMakeLists.txt | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 84bf188..bdb5903 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -70,13 +70,6 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra") + endif(NOT CMAKE_CXX_FLAGS MATCHES "-Wextra") + +- # Use -Werror for clang only. +- if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") +- if(NOT CMAKE_CXX_FLAGS MATCHES "-Werror") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") +- endif(NOT CMAKE_CXX_FLAGS MATCHES "-Werror") +- endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") +- + # Disable C++ exceptions. + string(REGEX REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions") +-- +2.37.1 (Apple Git-137.1) + diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 65c3808..3a96095 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,6 +15,7 @@ source: - 0001-Unbundle-gtest.patch - 0002-Disable-BMI2.patch - 0001-cmake-add-option-to-enable-disable-RTTI.patch + - 0001-Omit-Werror-during-compilation.patch build: number: 0