Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

folly: modernization followup #15726

Closed
wants to merge 45 commits into from
Closed

folly: modernization followup #15726

Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
ddfd59d
folly: bumpup version & conan v2 support
kexianda Oct 24, 2022
c3cd015
attach shell script for convenience
kexianda Nov 6, 2022
422afba
minor fix & fix lint warning
kexianda Nov 6, 2022
abe91dd
backport latest fix for generator expr
kexianda Nov 6, 2022
1c57a39
support conan-v1 cmake_find_package/cmake_find_package_multi generator
kexianda Nov 7, 2022
80185b7
fix libunwind
kexianda Nov 7, 2022
396a49b
bugfix: enable CMP0077
kexianda Nov 7, 2022
fcd0b25
fix issues on windows
kexianda Nov 10, 2022
df9b1cf
More modernize
Hopobcn Feb 4, 2023
8185064
Handle stdc++fs
Hopobcn Feb 4, 2023
a17bc99
Bump zlib to 1.2.13
Hopobcn Feb 4, 2023
23d3566
Handle case where compiler.cppstd is not provided, compiler minimal c…
Hopobcn Feb 4, 2023
e10890c
Revert CMAKE_POSITION_INDEPENDENT_CODE removal
Hopobcn Feb 5, 2023
0b11a2e
Remove duplication in test_package
Hopobcn Feb 5, 2023
d58de97
Prefer official release artifacts
Hopobcn Feb 5, 2023
ba94fe8
Change patch_type of PR folly/pull/1433 from backport to portability
Hopobcn Feb 5, 2023
0c75543
Bump libunwind requirement to 1.6.2
Hopobcn Feb 5, 2023
d36d69e
Prune imports
Hopobcn Feb 6, 2023
4432531
Instead of invalidating configuration if default_cppstd is lower than…
Hopobcn Feb 6, 2023
fd71318
Bump required openssl to openssl/1.1.1s
Hopobcn Feb 16, 2023
f86e969
Remove default_cppstd checks and default to min_cppstd if user doesn'…
Hopobcn Feb 16, 2023
3c557aa
Apply suggestions from code review
Hopobcn Feb 22, 2023
892d5c4
Improve test_package
Hopobcn Mar 11, 2023
1931f58
Add patch for missing limits include
Hopobcn Mar 12, 2023
07879e4
Set BOOST_LINK_STATIC
Hopobcn Mar 12, 2023
ee91b99
Set policy CMP0074
Hopobcn Mar 12, 2023
7c71463
Switch to f-strings
Hopobcn Mar 18, 2023
432a836
Make sure it uses cmake >= 3.13
Hopobcn Mar 18, 2023
0f3fffe
Folly 2022.01.31 & 2022.10.31 build on Macos armv8
Hopobcn Apr 3, 2023
7b4ba55
Disable windows
Hopobcn Apr 3, 2023
6a73e83
Revert "Folly 2022.01.31 & 2022.10.31 build on Macos armv8"
Hopobcn Apr 3, 2023
cd9bbe8
Fix conan2 version conflicts and provide trasitive_headers trait
Hopobcn Apr 4, 2023
0e2f792
Bump double-conversion to 3.2.1
Hopobcn Apr 4, 2023
4ec3bb6
Remove cmake_new_enough
Hopobcn Jun 4, 2023
ff9f7c1
Remove folly/2019.10.21.00
Hopobcn Jun 4, 2023
1ffa2a1
Declare openssl requirement with >=1.1 <4 version range
Hopobcn Jun 7, 2023
bf93a9f
Remove 2019.10.21.00 from config.yml
Hopobcn Jun 7, 2023
260303a
Do not specify requires traits for now
Hopobcn Jun 8, 2023
4deba32
Define test_type explicit
Hopobcn Jun 8, 2023
c02a32b
Add transitive_headers/transitive_libs to double-conversion
Hopobcn Jun 20, 2023
6626a07
Add transitive traits to boost
Hopobcn Jun 20, 2023
150ce4e
Add more transitive_headers, transitive_libs
Hopobcn Jun 21, 2023
39f211b
Add transitive_libs traits to lz4, zstd
Hopobcn Jun 22, 2023
2878d71
Order imports
Hopobcn Jun 23, 2023
dda9912
Force build
Hopobcn Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions recipes/folly/all/CMakeLists.txt
View file
Open in desktop

This file was deleted.

97 changes: 74 additions & 23 deletions recipes/folly/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,51 +6,102 @@ sources:
url: "https://github.com/facebook/folly/archive/v2020.08.10.00.tar.gz"
sha256: "e81140d04a4e89e3f848e528466a9b3d3ae37d7eeb9e65467fca50d70918eef6"
"2022.01.31.00":
url: "https://github.com/facebook/folly/archive/v2022.01.31.00.tar.gz"
sha256: "d764b9a7832d967bb7cfea4bcda15d650315aa4d559fde1da2a52b015cd88b9c"
url: "https://github.com/facebook/folly/releases/download/v2022.01.31.00/folly-v2022.01.31.00.tar.gz"
sha256: "7b8d5dd2eb51757858247af0ad27af2e3e93823f84033a628722b01e06cd68a9"
"2022.10.31.00":
url: "https://github.com/facebook/folly/releases/download/v2022.10.31.00/folly-v2022.10.31.00.tar.gz"
sha256: "d7749f78eee2a327c1fa6b4a290e4bcd7115cdd7f7ef59f9e043ed59e597ab30"
patches:
"2019.10.21.00":
- patch_file: "patches/0001-find-packages.patch"
base_path: "source_subfolder"
patch_description: "fix folly-deps.cmake"
patch_type: "conan"
- patch_file: "patches/0002-compiler-flags.patch"
base_path: "source_subfolder"
patch_description: "fix compiler flags"
patch_type: "conan"
- patch_file: "patches/0003-boost-shared-ptr.patch"
base_path: "source_subfolder"
patch_description: "fix boost shared ptr"
patch_type: "conan"
- patch_file: "patches/0004-disable-posix-names.patch"
base_path: "source_subfolder"
patch_description: "disable posix names"
patch_type: "conan"
- patch_file: "patches/0005-include-atomic.patch"
base_path: "source_subfolder"
patch_description: "include atomic"
patch_type: "conan"
- patch_file: "patches/0006-duplicate-hash.patch"
base_path: "source_subfolder"
patch_description: "duplicate hash"
patch_type: "conan"
- patch_file: "patches/0007-allow-builtins.patch"
base_path: "source_subfolder"
patch_description: "allow builtins"
patch_type: "conan"
- patch_file: "patches/0013-include-bit.patch"
base_path: "source_subfolder"
patch_description: "include bit"
patch_type: "conan"
- patch_file: "patches/0020-include-ssizet.patch"
base_path: "source_subfolder"
patch_description: "include ssizet"
patch_type: "conan"
- patch_file: "patches/0023-fix-cmake-generator-expr.patch"
patch_description: "CMake: Handle generator expressions requiring a target for pkg-config #1433"
patch_type: "portability"
patch_source: "https://github.com/facebook/folly/pull/1433"
- patch_file: "patches/0027-fix-numeric-limits-include.patch"
patch_description: "include limits"
patch_type: "conan"
"2020.08.10.00":
- patch_file: "patches/0008-find-packages.patch"
base_path: "source_subfolder"
patch_description: "fix folly-deps.cmake"
patch_type: "conan"
- patch_file: "patches/0009-ill-formed-atomic-copy.patch"
base_path: "source_subfolder"
patch_description: "fix ill-formed-atomic"
patch_type: "conan"
- patch_file: "patches/0010-duplicate-hash.patch"
base_path: "source_subfolder"
patch_description: "fix code"
patch_type: "conan"
- patch_file: "patches/0011-disable-logger-example.patch"
base_path: "source_subfolder"
patch_description: "exclude examples"
patch_type: "conan"
- patch_file: "patches/0012-compiler-flags.patch"
base_path: "source_subfolder"
patch_description: "fix flags"
patch_type: "conan"
- patch_file: "patches/0014-find-librt.patch"
base_path: "source_subfolder"
patch_description: "fix cmake"
patch_type: "conan"
- patch_file: "patches/0015-benchmark-format-macros.patch"
base_path: "source_subfolder"
patch_description: "fix code"
patch_type: "conan"
- patch_file: "patches/0024-fix-cmake-generator-expr.patch"
patch_description: "CMake: Handle generator expressions requiring a target for pkg-config #1433"
patch_type: "portability"
patch_source: "https://github.com/facebook/folly/pull/1433"
- patch_file: "patches/0028-fix-numeric-limits-include.patch"
patch_description: "include limits"
patch_type: "conan"
"2022.01.31.00":
- patch_file: "patches/0016-find-packages.patch"
base_path: "source_subfolder"
patch_description: "fix folly-deps.cmake"
patch_type: "conan"
- patch_file: "patches/0017-compiler-flags.patch"
base_path: "source_subfolder"
patch_description: "fix flags"
patch_type: "conan"
- patch_file: "patches/0018-find-glog.patch"
base_path: "source_subfolder"
patch_description: "fix cmake script"
patch_type: "conan"
- patch_file: "patches/0019-exclude-example.patch"
base_path: "source_subfolder"
patch_description: "exclude examples"
patch_type: "conan"
- patch_file: "patches/0022-fix-windows-minmax.patch"
base_path: "source_subfolder"
patch_description: "fix cmake script on window"
patch_type: "conan"
"2022.10.31.00":
- patch_file: "patches/0017-compiler-flags.patch"
patch_description: "fix the hard-coded flag"
patch_type: "conan"
- patch_file: "patches/0019-exclude-example.patch"
patch_description: "exclude example"
patch_type: "conan"
- patch_file: "patches/0025-find-packages.patch"
patch_description: "fix cmake find_package"
patch_type: "conan"
- patch_file: "patches/0026-fix-windows-minmax.patch"
patch_description: "fix cmake script on window"
patch_type: "conan"
Loading