From c6b818469edcc2c0b8f9c4b033529ad27edd6675 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 30 Jun 2022 17:31:37 +0000 Subject: [PATCH 1/6] updated v20220623.0 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d212743..c41f2d4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "abseil-cpp" %} -{% set version = "20211102.0" %} +{% set version = "20220623.0" %} package: name: {{ name|lower }} @@ -7,7 +7,7 @@ package: source: url: https://github.com/abseil/{{ name }}/archive/{{ version }}.tar.gz - sha256: dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4 + sha256: 4208129b49006089ba1d6710845a45e31c59b0ab6bff9e5788a87f55c5abd602 patches: #- linux-librt.patch # [linux] - clang4_osx_fix.diff # [osx] @@ -15,7 +15,7 @@ source: - remove-4221.patch # [win] build: - number: 1 + number: 0 run_exports: - {{ pin_subpackage("abseil-cpp", max_pin="x.x") }} From 62f520db285c4bf1795326c7cdea7a4ba45b2f3e Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 30 Jun 2022 17:32:02 +0000 Subject: [PATCH 2/6] MNT: Re-rendered with conda-build 3.21.9, conda-smithy 3.21.0, and conda-forge-pinning 2022.06.30.11.45.20 --- .azure-pipelines/azure-pipelines-win.yml | 69 ++++++++---------------- .ci_support/README | 12 ++--- .ci_support/osx_64_.yaml | 4 +- .ci_support/osx_arm64_.yaml | 4 +- .circleci/config.yml | 3 +- .scripts/build_steps.sh | 9 +++- .scripts/run_osx_build.sh | 4 ++ LICENSE.txt | 30 ++++++++--- README.md | 69 ++++++++++++++++-------- build-locally.py | 19 ++++--- 10 files changed, 128 insertions(+), 95 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 88fd9c1..8a0bcae 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -16,45 +16,27 @@ jobs: CONDA_BLD_PATH: D:\\bld\\ steps: - - script: | - choco install vcpython27 -fdv -y --debug - condition: contains(variables['CONFIG'], 'vs2008') - displayName: Install vcpython27.msi (if needed) - - # Cygwin's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.) - # - script: rmdir C:\cygwin /s /q - # continueOnError: true - - - powershell: | - Set-PSDebug -Trace 1 - - $batchcontent = @" - ECHO ON - SET vcpython=C:\Program Files (x86)\Common Files\Microsoft\Visual C++ for Python\9.0 - - DIR "%vcpython%" - - CALL "%vcpython%\vcvarsall.bat" %* - "@ - - $batchDir = "C:\Program Files (x86)\Common Files\Microsoft\Visual C++ for Python\9.0\VC" - $batchPath = "$batchDir" + "\vcvarsall.bat" - New-Item -Path $batchPath -ItemType "file" -Force - - Set-Content -Value $batchcontent -Path $batchPath + - 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) - Get-ChildItem -Path $batchDir + - script: | + start /wait "" %BUILD_ARTIFACTSTAGINGDIRECTORY%\Miniforge.exe /InstallationType=JustMe /RegisterPython=0 /S /D=C:\Miniforge + displayName: Install Miniforge - Get-ChildItem -Path ($batchDir + '\..') + - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" + displayName: Add conda to PATH - condition: contains(variables['CONFIG'], 'vs2008') - displayName: Patch vs2008 (if needed) - - task: CondaEnvironment@1 - inputs: - packageSpecs: 'python=3.9 conda-build conda pip boa conda-forge-ci-setup=3' # Optional - installOptions: "-c conda-forge" - updateConda: true - displayName: Install conda-build and activate environment + - script: | + call activate base + mamba.exe install 'python=3.9' 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 @@ -71,25 +53,16 @@ jobs: call activate base run_conda_forge_build_setup displayName: conda-forge build setup - - - # Special cased version setting some more things! - - script: | - call activate base - conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml - displayName: Build recipe (vs2008) - env: - VS90COMNTOOLS: "C:\\Program Files (x86)\\Common Files\\Microsoft\\Visual C++ for Python\\9.0\\VC\\bin" - PYTHONUNBUFFERED: 1 - condition: contains(variables['CONFIG'], 'vs2008') - 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 - condition: not(contains(variables['CONFIG'], 'vs2008')) - script: | set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" call activate base diff --git a/.ci_support/README b/.ci_support/README index 69c5db6..a47316b 100644 --- a/.ci_support/README +++ b/.ci_support/README @@ -1,6 +1,6 @@ -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. +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/osx_64_.yaml b/.ci_support/osx_64_.yaml index 87581e2..b65c9ea 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' macos_machine: - x86_64-apple-darwin13.4.0 target_platform: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 48127da..e398c78 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' macos_machine: - arm64-apple-darwin20.0.0 target_platform: 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. 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/README.md b/README.md index 41a6bc0..dd630f9 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Home: https://github.com/abseil/abseil-cpp Package license: Apache-2.0 -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/abseil-cpp-feedstock/blob/master/LICENSE.txt) +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/abseil-cpp-feedstock/blob/main/LICENSE.txt) Summary: Abseil Common Libraries (C++) @@ -28,8 +28,8 @@ Current build status
- - + + @@ -37,43 +37,43 @@ Current build status @@ -101,18 +101,43 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `abseil-cpp` can be installed with: +Once the `conda-forge` channel has been enabled, `abseil-cpp` can be installed with `conda`: ``` conda install abseil-cpp ``` -It is possible to list all of the versions of `abseil-cpp` available on your platform with: +or with `mamba`: + +``` +mamba install abseil-cpp +``` + +It is possible to list all of the versions of `abseil-cpp` available on your platform with `conda`: ``` conda search abseil-cpp --channel conda-forge ``` +or with `mamba`: + +``` +mamba search abseil-cpp --channel conda-forge +``` + +Alternatively, `mamba repoquery` may provide more information: + +``` +# Search all versions available on your platform: +mamba repoquery search abseil-cpp --channel conda-forge + +# List packages depending on `abseil-cpp`: +mamba repoquery whoneeds abseil-cpp --channel conda-forge + +# List dependencies of `abseil-cpp`: +mamba repoquery depends abseil-cpp --channel conda-forge +``` + About conda-forge ================= @@ -128,10 +153,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 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 9bd55a7b22331dca0258c07d94ecd2f8b1240a06 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 2 Mar 2022 08:45:11 +1100 Subject: [PATCH 3/6] normalize patches --- recipe/meta.yaml | 7 ++- recipe/osx_framework_fix.diff | 19 -------- ...h-out-the-build-issue-on-clang4-osx.patch} | 14 +++++- ...to-the-CoreFoundation-framework-on-O.patch | 31 +++++++++++++ ...-ignore-4221-from-ABSL_MSVC_LINKOPTS.patch | 45 +++++++++++++++++++ recipe/remove-4221.patch | 27 ----------- 6 files changed, 92 insertions(+), 51 deletions(-) delete mode 100644 recipe/osx_framework_fix.diff rename recipe/{clang4_osx_fix.diff => patches/0001-patch-out-the-build-issue-on-clang4-osx.patch} (56%) create mode 100644 recipe/patches/0002-fix-for-linking-to-the-CoreFoundation-framework-on-O.patch create mode 100644 recipe/patches/0003-remove-ignore-4221-from-ABSL_MSVC_LINKOPTS.patch delete mode 100644 recipe/remove-4221.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c41f2d4..1a1b264 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,10 +9,9 @@ source: url: https://github.com/abseil/{{ name }}/archive/{{ version }}.tar.gz sha256: 4208129b49006089ba1d6710845a45e31c59b0ab6bff9e5788a87f55c5abd602 patches: - #- linux-librt.patch # [linux] - - clang4_osx_fix.diff # [osx] - - osx_framework_fix.diff # [osx] - - remove-4221.patch # [win] + - patches/0001-patch-out-the-build-issue-on-clang4-osx.patch + - patches/0002-fix-for-linking-to-the-CoreFoundation-framework-on-O.patch + - patches/0003-remove-ignore-4221-from-ABSL_MSVC_LINKOPTS.patch build: number: 0 diff --git a/recipe/osx_framework_fix.diff b/recipe/osx_framework_fix.diff deleted file mode 100644 index 6a6af39..0000000 --- a/recipe/osx_framework_fix.diff +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/absl/time/CMakeLists.txt b/absl/time/CMakeLists.txt -index 5909832..087bb6a 100644 ---- a/absl/time/CMakeLists.txt -+++ b/absl/time/CMakeLists.txt -@@ -82,10 +82,12 @@ absl_cc_library( - "internal/cctz/src/zone_info_source.cc" - COPTS - ${ABSL_DEFAULT_COPTS} -- DEPS -- $<$:${CoreFoundation}> - ) - -+if(APPLE) -+ target_link_options(time_zone PUBLIC -framework CoreFoundation) -+endif() -+ - absl_cc_library( - NAME - test_util diff --git a/recipe/clang4_osx_fix.diff b/recipe/patches/0001-patch-out-the-build-issue-on-clang4-osx.patch similarity index 56% rename from recipe/clang4_osx_fix.diff rename to recipe/patches/0001-patch-out-the-build-issue-on-clang4-osx.patch index 6f48650..aba5cd1 100644 --- a/recipe/clang4_osx_fix.diff +++ b/recipe/patches/0001-patch-out-the-build-issue-on-clang4-osx.patch @@ -1,5 +1,14 @@ +From 50b8f574cfc8a6868f9fc74741c384f50e3ef540 Mon Sep 17 00:00:00 2001 +From: Francesco Biscani +Date: Sat, 21 Sep 2019 15:05:46 +0200 +Subject: [PATCH 1/3] patch out the build issue on clang4 osx + +--- + absl/time/internal/cctz/include/cctz/civil_time_detail.h | 4 ++++ + 1 file changed, 4 insertions(+) + diff --git a/absl/time/internal/cctz/include/cctz/civil_time_detail.h b/absl/time/internal/cctz/include/cctz/civil_time_detail.h -index 53e087a..3db7dca 100644 +index 8aadde5..2dac15c 100644 --- a/absl/time/internal/cctz/include/cctz/civil_time_detail.h +++ b/absl/time/internal/cctz/include/cctz/civil_time_detail.h @@ -15,6 +15,10 @@ @@ -13,3 +22,6 @@ index 53e087a..3db7dca 100644 #include #include #include +-- +2.35.1.windows.2 + diff --git a/recipe/patches/0002-fix-for-linking-to-the-CoreFoundation-framework-on-O.patch b/recipe/patches/0002-fix-for-linking-to-the-CoreFoundation-framework-on-O.patch new file mode 100644 index 0000000..06afef1 --- /dev/null +++ b/recipe/patches/0002-fix-for-linking-to-the-CoreFoundation-framework-on-O.patch @@ -0,0 +1,31 @@ +From 341b5875ad617a45600d19ac03d78e68ef8a39b0 Mon Sep 17 00:00:00 2001 +From: Francesco Biscani +Date: Sat, 21 Sep 2019 21:39:26 +0200 +Subject: [PATCH 2/3] fix for linking to the CoreFoundation framework on OSX + +--- + absl/time/CMakeLists.txt | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/absl/time/CMakeLists.txt b/absl/time/CMakeLists.txt +index f6ff8bd..ba7f65f 100644 +--- a/absl/time/CMakeLists.txt ++++ b/absl/time/CMakeLists.txt +@@ -83,10 +83,12 @@ absl_cc_library( + "internal/cctz/src/zone_info_source.cc" + COPTS + ${ABSL_DEFAULT_COPTS} +- DEPS +- $<$:${CoreFoundation}> + ) + ++if(APPLE) ++ target_link_options(time_zone PUBLIC -framework CoreFoundation) ++endif() ++ + absl_cc_library( + NAME + time_internal_test_util +-- +2.35.1.windows.2 + diff --git a/recipe/patches/0003-remove-ignore-4221-from-ABSL_MSVC_LINKOPTS.patch b/recipe/patches/0003-remove-ignore-4221-from-ABSL_MSVC_LINKOPTS.patch new file mode 100644 index 0000000..b925c8d --- /dev/null +++ b/recipe/patches/0003-remove-ignore-4221-from-ABSL_MSVC_LINKOPTS.patch @@ -0,0 +1,45 @@ +From 958c72f3853ff0c7ab1d9718aedd3ec34b7e5c45 Mon Sep 17 00:00:00 2001 +From: "Uwe L. Korn" +Date: Thu, 30 Jul 2020 13:01:32 +0200 +Subject: [PATCH 3/3] remove "-ignore:4221" from ABSL_MSVC_LINKOPTS + +see also https://github.com/microsoft/vcpkg/issues/13945 +--- + absl/copts/GENERATED_AbseilCopts.cmake | 4 ---- + absl/copts/copts.py | 5 +---- + 2 files changed, 1 insertion(+), 8 deletions(-) + +diff --git a/absl/copts/GENERATED_AbseilCopts.cmake b/absl/copts/GENERATED_AbseilCopts.cmake +index a4ab1aa..f2cdfa0 100644 +--- a/absl/copts/GENERATED_AbseilCopts.cmake ++++ b/absl/copts/GENERATED_AbseilCopts.cmake +@@ -135,10 +135,6 @@ list(APPEND ABSL_MSVC_FLAGS + "/wd4800" + ) + +-list(APPEND ABSL_MSVC_LINKOPTS +- "-ignore:4221" +-) +- + list(APPEND ABSL_MSVC_TEST_FLAGS + "/wd4018" + "/wd4101" +diff --git a/absl/copts/copts.py b/absl/copts/copts.py +index 0d6c1ec..8df9275 100644 +--- a/absl/copts/copts.py ++++ b/absl/copts/copts.py +@@ -148,10 +148,7 @@ COPT_VARS = { + "/wd4996", # use of deprecated symbol + "/DNOMINMAX", # disable the min() and max() macros from + ], +- "ABSL_MSVC_LINKOPTS": [ +- # Object file doesn't export any previously undefined symbols +- "-ignore:4221", +- ], ++ "ABSL_MSVC_LINKOPTS": [], + # "HWAES" is an abbreviation for "hardware AES" (AES - Advanced Encryption + # Standard). These flags are used for detecting whether or not the target + # architecture has hardware support for AES instructions which can be used +-- +2.35.1.windows.2 + diff --git a/recipe/remove-4221.patch b/recipe/remove-4221.patch deleted file mode 100644 index 8e64adf..0000000 --- a/recipe/remove-4221.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- ./absl/copts/copts.py.oirg 2020-07-30 12:57:32.000000000 +0200 -+++ ./absl/copts/copts.py 2020-07-30 12:57:51.000000000 +0200 -@@ -182,10 +182,7 @@ - "/wd4996", # use of deprecated symbol - "/DNOMINMAX", # disable the min() and max() macros from - ], -- "ABSL_MSVC_LINKOPTS": [ -- # Object file doesn't export any previously undefined symbols -- "-ignore:4221", -- ], -+ "ABSL_MSVC_LINKOPTS": [], - # "HWAES" is an abbreviation for "hardware AES" (AES - Advanced Encryption - # Standard). These flags are used for detecting whether or not the target - # architecture has hardware support for AES instructions which can be used ---- ./absl/copts/GENERATED_AbseilCopts.cmake.orig 2020-07-30 12:57:39.000000000 +0200 -+++ ./absl/copts/GENERATED_AbseilCopts.cmake 2020-07-30 12:58:31.000000000 +0200 -@@ -184,10 +184,6 @@ - "/wd4800" - ) - --list(APPEND ABSL_MSVC_LINKOPTS -- "-ignore:4221" --) -- - list(APPEND ABSL_MSVC_TEST_FLAGS - "/wd4018" - "/wd4101" From 25985fb428419725687a7c6215692a2a730696d0 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 1 Jul 2022 12:53:12 +0200 Subject: [PATCH 4/6] rebase patches --- .../0001-patch-out-the-build-issue-on-clang4-osx.patch | 6 +++--- ...for-linking-to-the-CoreFoundation-framework-on-O.patch | 8 ++++---- .../0003-remove-ignore-4221-from-ABSL_MSVC_LINKOPTS.patch | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/recipe/patches/0001-patch-out-the-build-issue-on-clang4-osx.patch b/recipe/patches/0001-patch-out-the-build-issue-on-clang4-osx.patch index aba5cd1..74963f7 100644 --- a/recipe/patches/0001-patch-out-the-build-issue-on-clang4-osx.patch +++ b/recipe/patches/0001-patch-out-the-build-issue-on-clang4-osx.patch @@ -1,4 +1,4 @@ -From 50b8f574cfc8a6868f9fc74741c384f50e3ef540 Mon Sep 17 00:00:00 2001 +From 336f3e70a058f6b07aa25725ea2a23a739f190ef Mon Sep 17 00:00:00 2001 From: Francesco Biscani Date: Sat, 21 Sep 2019 15:05:46 +0200 Subject: [PATCH 1/3] patch out the build issue on clang4 osx @@ -8,7 +8,7 @@ Subject: [PATCH 1/3] patch out the build issue on clang4 osx 1 file changed, 4 insertions(+) diff --git a/absl/time/internal/cctz/include/cctz/civil_time_detail.h b/absl/time/internal/cctz/include/cctz/civil_time_detail.h -index 8aadde5..2dac15c 100644 +index a5b084e6..0a9a4389 100644 --- a/absl/time/internal/cctz/include/cctz/civil_time_detail.h +++ b/absl/time/internal/cctz/include/cctz/civil_time_detail.h @@ -15,6 +15,10 @@ @@ -23,5 +23,5 @@ index 8aadde5..2dac15c 100644 #include #include -- -2.35.1.windows.2 +2.35.3.windows.1 diff --git a/recipe/patches/0002-fix-for-linking-to-the-CoreFoundation-framework-on-O.patch b/recipe/patches/0002-fix-for-linking-to-the-CoreFoundation-framework-on-O.patch index 06afef1..b7ac08e 100644 --- a/recipe/patches/0002-fix-for-linking-to-the-CoreFoundation-framework-on-O.patch +++ b/recipe/patches/0002-fix-for-linking-to-the-CoreFoundation-framework-on-O.patch @@ -1,4 +1,4 @@ -From 341b5875ad617a45600d19ac03d78e68ef8a39b0 Mon Sep 17 00:00:00 2001 +From a99ff2d64fb489dfc207572edb2d8a151d3c92f9 Mon Sep 17 00:00:00 2001 From: Francesco Biscani Date: Sat, 21 Sep 2019 21:39:26 +0200 Subject: [PATCH 2/3] fix for linking to the CoreFoundation framework on OSX @@ -8,7 +8,7 @@ Subject: [PATCH 2/3] fix for linking to the CoreFoundation framework on OSX 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/absl/time/CMakeLists.txt b/absl/time/CMakeLists.txt -index f6ff8bd..ba7f65f 100644 +index debab3ba..4eb9ebf8 100644 --- a/absl/time/CMakeLists.txt +++ b/absl/time/CMakeLists.txt @@ -83,10 +83,12 @@ absl_cc_library( @@ -23,9 +23,9 @@ index f6ff8bd..ba7f65f 100644 + target_link_options(time_zone PUBLIC -framework CoreFoundation) +endif() + + # Internal-only target, do not depend on directly. absl_cc_library( NAME - time_internal_test_util -- -2.35.1.windows.2 +2.35.3.windows.1 diff --git a/recipe/patches/0003-remove-ignore-4221-from-ABSL_MSVC_LINKOPTS.patch b/recipe/patches/0003-remove-ignore-4221-from-ABSL_MSVC_LINKOPTS.patch index b925c8d..71e8b2d 100644 --- a/recipe/patches/0003-remove-ignore-4221-from-ABSL_MSVC_LINKOPTS.patch +++ b/recipe/patches/0003-remove-ignore-4221-from-ABSL_MSVC_LINKOPTS.patch @@ -1,4 +1,4 @@ -From 958c72f3853ff0c7ab1d9718aedd3ec34b7e5c45 Mon Sep 17 00:00:00 2001 +From 1a77917fe7c5c3feece1a608d5537f848f4e930f Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 30 Jul 2020 13:01:32 +0200 Subject: [PATCH 3/3] remove "-ignore:4221" from ABSL_MSVC_LINKOPTS @@ -10,7 +10,7 @@ see also https://github.com/microsoft/vcpkg/issues/13945 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/absl/copts/GENERATED_AbseilCopts.cmake b/absl/copts/GENERATED_AbseilCopts.cmake -index a4ab1aa..f2cdfa0 100644 +index a4ab1aa2..f2cdfa0c 100644 --- a/absl/copts/GENERATED_AbseilCopts.cmake +++ b/absl/copts/GENERATED_AbseilCopts.cmake @@ -135,10 +135,6 @@ list(APPEND ABSL_MSVC_FLAGS @@ -25,7 +25,7 @@ index a4ab1aa..f2cdfa0 100644 "/wd4018" "/wd4101" diff --git a/absl/copts/copts.py b/absl/copts/copts.py -index 0d6c1ec..8df9275 100644 +index 0d6c1ec3..8df92751 100644 --- a/absl/copts/copts.py +++ b/absl/copts/copts.py @@ -148,10 +148,7 @@ COPT_VARS = { @@ -41,5 +41,5 @@ index 0d6c1ec..8df9275 100644 # Standard). These flags are used for detecting whether or not the target # architecture has hardware support for AES instructions which can be used -- -2.35.1.windows.2 +2.35.3.windows.1 From 453eb00721c730cdf60c690d9720cb4404178a78 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 1 Jul 2022 13:38:21 +0200 Subject: [PATCH 5/6] add patch for osx --- recipe/meta.yaml | 1 + ...ch-out-the-build-issue-on-clang4-osx.patch | 2 +- ...to-the-CoreFoundation-framework-on-O.patch | 2 +- ...-ignore-4221-from-ABSL_MSVC_LINKOPTS.patch | 2 +- .../0004-add-missing-osx-workaround.patch | 27 +++++++++++++++++++ 5 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 recipe/patches/0004-add-missing-osx-workaround.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1a1b264..196a3c2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,6 +12,7 @@ source: - patches/0001-patch-out-the-build-issue-on-clang4-osx.patch - patches/0002-fix-for-linking-to-the-CoreFoundation-framework-on-O.patch - patches/0003-remove-ignore-4221-from-ABSL_MSVC_LINKOPTS.patch + - patches/0004-add-missing-osx-workaround.patch build: number: 0 diff --git a/recipe/patches/0001-patch-out-the-build-issue-on-clang4-osx.patch b/recipe/patches/0001-patch-out-the-build-issue-on-clang4-osx.patch index 74963f7..9becb87 100644 --- a/recipe/patches/0001-patch-out-the-build-issue-on-clang4-osx.patch +++ b/recipe/patches/0001-patch-out-the-build-issue-on-clang4-osx.patch @@ -1,7 +1,7 @@ From 336f3e70a058f6b07aa25725ea2a23a739f190ef Mon Sep 17 00:00:00 2001 From: Francesco Biscani Date: Sat, 21 Sep 2019 15:05:46 +0200 -Subject: [PATCH 1/3] patch out the build issue on clang4 osx +Subject: [PATCH 1/4] patch out the build issue on clang4 osx --- absl/time/internal/cctz/include/cctz/civil_time_detail.h | 4 ++++ diff --git a/recipe/patches/0002-fix-for-linking-to-the-CoreFoundation-framework-on-O.patch b/recipe/patches/0002-fix-for-linking-to-the-CoreFoundation-framework-on-O.patch index b7ac08e..94ae4cf 100644 --- a/recipe/patches/0002-fix-for-linking-to-the-CoreFoundation-framework-on-O.patch +++ b/recipe/patches/0002-fix-for-linking-to-the-CoreFoundation-framework-on-O.patch @@ -1,7 +1,7 @@ From a99ff2d64fb489dfc207572edb2d8a151d3c92f9 Mon Sep 17 00:00:00 2001 From: Francesco Biscani Date: Sat, 21 Sep 2019 21:39:26 +0200 -Subject: [PATCH 2/3] fix for linking to the CoreFoundation framework on OSX +Subject: [PATCH 2/4] fix for linking to the CoreFoundation framework on OSX --- absl/time/CMakeLists.txt | 6 ++++-- diff --git a/recipe/patches/0003-remove-ignore-4221-from-ABSL_MSVC_LINKOPTS.patch b/recipe/patches/0003-remove-ignore-4221-from-ABSL_MSVC_LINKOPTS.patch index 71e8b2d..bea3002 100644 --- a/recipe/patches/0003-remove-ignore-4221-from-ABSL_MSVC_LINKOPTS.patch +++ b/recipe/patches/0003-remove-ignore-4221-from-ABSL_MSVC_LINKOPTS.patch @@ -1,7 +1,7 @@ From 1a77917fe7c5c3feece1a608d5537f848f4e930f Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 30 Jul 2020 13:01:32 +0200 -Subject: [PATCH 3/3] remove "-ignore:4221" from ABSL_MSVC_LINKOPTS +Subject: [PATCH 3/4] remove "-ignore:4221" from ABSL_MSVC_LINKOPTS see also https://github.com/microsoft/vcpkg/issues/13945 --- diff --git a/recipe/patches/0004-add-missing-osx-workaround.patch b/recipe/patches/0004-add-missing-osx-workaround.patch new file mode 100644 index 0000000..a5a2754 --- /dev/null +++ b/recipe/patches/0004-add-missing-osx-workaround.patch @@ -0,0 +1,27 @@ +From 3b5f3943a593d5c7544b594d0bd6eec569d26067 Mon Sep 17 00:00:00 2001 +From: "H. Vetinari" +Date: Fri, 1 Jul 2022 13:37:17 +0200 +Subject: [PATCH 4/4] add missing osx workaround + +--- + absl/debugging/internal/examine_stack.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/absl/debugging/internal/examine_stack.cc b/absl/debugging/internal/examine_stack.cc +index 5bdd341e..e86f384f 100644 +--- a/absl/debugging/internal/examine_stack.cc ++++ b/absl/debugging/internal/examine_stack.cc +@@ -26,6 +26,10 @@ + #include + #endif + ++#if defined(MAP_ANON) && !defined(MAP_ANONYMOUS) ++#define MAP_ANONYMOUS MAP_ANON ++#endif ++ + #if defined(__linux__) || defined(__APPLE__) + #include + #endif +-- +2.35.3.windows.1 + From 8a2ee0728685673fa09dfd5aa57525282e52d56a Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 1 Jul 2022 13:39:30 +0200 Subject: [PATCH 6/6] remove useless variable --- recipe/meta.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 196a3c2..7d3953f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,12 +1,11 @@ -{% set name = "abseil-cpp" %} {% set version = "20220623.0" %} package: - name: {{ name|lower }} + name: abseil-cpp version: {{ version }} source: - url: https://github.com/abseil/{{ name }}/archive/{{ version }}.tar.gz + url: https://github.com/abseil/abseil-cpp/archive/{{ version }}.tar.gz sha256: 4208129b49006089ba1d6710845a45e31c59b0ab6bff9e5788a87f55c5abd602 patches: - patches/0001-patch-out-the-build-issue-on-clang4-osx.patch
linux_64 - - variant + + variant
linux_aarch64 - - variant + + variant
linux_ppc64le - - variant + + variant
osx_64 - - variant + + variant
osx_arm64 - - variant + + variant
win_64 - - variant + + variant