folly: migrate to Conan v2 #21109

valgur · 2023-11-14T07:52:18Z

Continues from #15726.

* bumpup to v20221031.00 * conan v2 support * only include needed boost components, not all the boost components, to avoid static link order issue in some cases. * remove cmake version limitation

…hecks pass, but default_cppstd is lower than minimal_cppstd

Co-authored-by: Chris Mc <[email protected]>

… min_cppstd, set min_cppstd if the compiler supports it

…t provide compiler.cppstd

Co-authored-by: Chris Mc <[email protected]>

Which in turn sets FOLLY_BOOST_LINK_STATIC, which ends up setting Boost_USE_STATIC_LIBS

Signed-off-by: Uilian Ries <[email protected]>

This reverts commit 37a4502.

Signed-off-by: Uilian Ries <[email protected]>

…on-followup

uilianries · 2024-08-21T08:10:21Z

I did some important changes in this PR:

As Folly project changes every "release" and is hard to maintain, I minimized the recipe to few options.
Add CMake as build requirement due conan_deps.cmake using ZIP_LISTS
Updated to the Folly version 2024.08.12.00
Removed use_sse4_2 option. Very specific option that could be injected via Conan conf. It could be re-included, in case users start to ask in issues.
Set as static-library on Windows. Folly official does not support shared lib on Windows: Folly can not be built on Windows as shared library facebook/folly#962
Update dependencies to the last version available in Conan Center
Kept fmt 10.x due current bug reported: GenPkgConfig.cmake: file(GENERATE) failed with $<COMPILE_LANGUAGE> in fmt 11.0.0 MSVC facebook/folly#2250. I prefer waiting an official patch.
Apple clang support is much better now, but requires version >=14: Build fails on macOS 10.15: ThreadLocal.h: error: no matching constructor for initialization of 'std::function<LocalRefCount ()>' facebook/folly#2266 (I'll post build logs asap)
Skip generating folly.pc due failure on Windows. Does not matter, we should use PkgConfigDeps.
Simplified test package to avoid compiler warnings.

valgur · 2024-08-21T08:16:35Z

Excellent work, @uilianries. Thank you so much! I can't approve my own PR, of course, but all of the changes LGTM.

This reverts commit 2eb919d.

uilianries · 2024-08-21T08:22:03Z

@valgur Let's keep those specific versions for zstd and libuing to avoid conflicts:

ERROR: Version conflict: Conflict between zstd/1.5.5 and zstd/1.5.6 in the graph:
Conflict originates from libdwarf/0.9.1

uilianries · 2024-08-21T08:47:51Z

Mac build logs (locally):

Multiple profiles, but all them running in Mac M1 and Apple-Clang 15

folly-2024.08.12.00-mac-shared-intel.log
folly-2024.08.12.00-mac-shared.log
folly-2024.08.12.00-mac-static-intel.log
folly-2024.08.12.00-mac-static.log

recipes/folly/all/conan_deps.cmake

Co-authored-by: Luis Caro Campos <[email protected]>

recipes/folly/all/conan_deps.cmake

conan-center-bot · 2024-08-21T10:13:11Z

Conan v1 pipeline ✔️

All green in build 25 (8a4735159046a41a1e0fb6319219878a7e92041c):

folly/2024.08.12.00:
All packages built successfully! (All logs)

Conan v2 pipeline ✔️

Note: Conan v2 builds are now mandatory. Please read our discussion about it.

All green in build 25 (8a4735159046a41a1e0fb6319219878a7e92041c):

folly/2024.08.12.00:
All packages built successfully! (All logs)

Hopobcn

Thanks @uilianries and @valgur for fixing this! 🚀

AbrilRBS · 2024-08-22T08:41:16Z

recipes/folly/all/conanfile.py

+        if not self.dependencies["boost"].options.header_only:
+            tc.cache_variables["BOOST_LINK_STATIC"] = not self.dependencies["boost"].options.shared
+
+        tc.cache_variables["CMAKE_POLICY_DEFAULT_CMP0074"] = "NEW"  # Honor Boost_ROOT set by boost recipe


this is duplicated but not worth a recompilation

Agreed! Thank you for spotting!

uilianries

LGTM

* folly: bumpup version & conan v2 support * bumpup to v20221031.00 * conan v2 support * only include needed boost components, not all the boost components, to avoid static link order issue in some cases. * remove cmake version limitation * attach shell script for convenience * minor fix & fix lint warning * backport latest fix for generator expr * support conan-v1 cmake_find_package/cmake_find_package_multi generator * fix libunwind * bugfix: enable CMP0077 * fix issues on windows * More modernize * Handle stdc++fs * Bump zlib to 1.2.13 * Handle case where compiler.cppstd is not provided, compiler minimal checks pass, but default_cppstd is lower than minimal_cppstd * Revert CMAKE_POSITION_INDEPENDENT_CODE removal * Remove duplication in test_package * Prefer official release artifacts * Change patch_type of PR folly/pull/1433 from backport to portability * Bump libunwind requirement to 1.6.2 * Prune imports Co-authored-by: Chris Mc <[email protected]> * Instead of invalidating configuration if default_cppstd is lower than min_cppstd, set min_cppstd if the compiler supports it * Bump required openssl to openssl/1.1.1s * Remove default_cppstd checks and default to min_cppstd if user doesn't provide compiler.cppstd * Apply suggestions from code review Co-authored-by: Chris Mc <[email protected]> * Improve test_package * Add patch for missing limits include * Set BOOST_LINK_STATIC Which in turn sets FOLLY_BOOST_LINK_STATIC, which ends up setting Boost_USE_STATIC_LIBS * Set policy CMP0074 * Switch to f-strings * Make sure it uses cmake >= 3.13 * Folly 2022.01.31 & 2022.10.31 build on Macos armv8 * Disable windows * Revert "Folly 2022.01.31 & 2022.10.31 build on Macos armv8" This reverts commit 0f3fffe. * Fix conan2 version conflicts and provide trasitive_headers trait * Bump double-conversion to 3.2.1 * Remove cmake_new_enough * Remove folly/2019.10.21.00 * Declare openssl requirement with >=1.1 <4 version range * Remove 2019.10.21.00 from config.yml * Do not specify requires traits for now * Define test_type explicit * Add transitive_headers/transitive_libs to double-conversion * Add transitive traits to boost * Add more transitive_headers, transitive_libs - make boost, double-conversion, glog, libevent, fmt available to consumers * Add transitive_libs traits to lz4, zstd * Order imports * folly: drop v2020.08.10.00 * folly: bump deps * folly: do not set CMAKE_C_FLAGS directly * folly: add msvc version check * folly: use is_apple_os() * folly: keep only the newest version * folly: bump deps * folly: fix _cppstd_flag_value() * folly: simplify libatomic check * folly: simplify patching * folly: add v2023.12.18.00 * folly: fix ambiguity between package cmake target and libfolly cmake target * Add missing libfolly dependency * Do not allow static glog if building shared folly * Leave fixing recipe for macos for the future * Link only boost components specified in requirements * Refactor conan_deps.cmake * folly: bump deps, fix version conflicts * folly: add latest version, drop -g patch, fix missing include * folly: update min GCC version * folly: CMP0075 is set by project since 2019 * folly: use is_msvc_static_runtime() * folly: bump to v2024.07.08.00 * folly: drop v2022.10.31.00 Focus on getting the latest version working first. * folly: update min compiler versions * folly: workaround for CMAKE_PROJECT_folly_INCLUDE * folly: bump to v2024.07.15.00 * Follow official patch Signed-off-by: Uilian Ries <[email protected]> * Improve invalid conf messages Signed-off-by: Uilian Ries <[email protected]> * Remove folly custom find cmake files Signed-off-by: Uilian Ries <[email protected]> * Add version 2024.08.12.00 Signed-off-by: Uilian Ries <[email protected]> * Use cmake cache variables Signed-off-by: Uilian Ries <[email protected]> * Simplify test package Signed-off-by: Uilian Ries <[email protected]> * Remove folly version from tests Signed-off-by: Uilian Ries <[email protected]> * Require cmake 3.17 for conan_deps.cmake Signed-off-by: Uilian Ries <[email protected]> * Update dependencies versions Signed-off-by: Uilian Ries <[email protected]> * Exclude 2024.07.15.00 Signed-off-by: Uilian Ries <[email protected]> * Remove not used defines Signed-off-by: Uilian Ries <[email protected]> * Update boost modules based on headers Signed-off-by: Uilian Ries <[email protected]> * Solve version conflict Signed-off-by: Uilian Ries <[email protected]> * Fix required boost modules Signed-off-by: Uilian Ries <[email protected]> * Enable dependencies based on system Signed-off-by: Uilian Ries <[email protected]> * Avoid folly format due deprecation Signed-off-by: Uilian Ries <[email protected]> * Drop apple restriction Signed-off-by: Uilian Ries <[email protected]> * Drop Windows restriction Signed-off-by: Uilian Ries <[email protected]> * Drop sse4 option Signed-off-by: Uilian Ries <[email protected]> * Drop jemalloc Signed-off-by: Uilian Ries <[email protected]> * Skip apple clang <=13 Signed-off-by: Uilian Ries <[email protected]> * Enable shared build with Clang in Linux Signed-off-by: Uilian Ries <[email protected]> * Require Apple clang 14 Signed-off-by: Uilian Ries <[email protected]> * Drop glog restriction Signed-off-by: Uilian Ries <[email protected]> * Downgrade fmt to version 10.x due Windows Signed-off-by: Uilian Ries <[email protected]> * Add support for fmt-11 Signed-off-by: Uilian Ries <[email protected]> * Try to fix gflags check in msvc Signed-off-by: Uilian Ries <[email protected]> * Drop libaio dependency Signed-off-by: Uilian Ries <[email protected]> * Simplify cpp flag for windows Signed-off-by: Uilian Ries <[email protected]> * Avoid generating .pc file Signed-off-by: Uilian Ries <[email protected]> * Avoid using fmt-11 patch Signed-off-by: Uilian Ries <[email protected]> * Revert "Avoid using fmt-11 patch" This reverts commit 37a4502. * Downgrade fmt to 10 Signed-off-by: Uilian Ries <[email protected]> * remove patch from conandata Signed-off-by: Uilian Ries <[email protected]> * folly: use a version range for zstd, bump liburing * Revert "folly: use a version range for zstd, bump liburing" This reverts commit 2eb919d. * do not enforce cmake prefix path in deps.cmake Co-authored-by: Luis Caro Campos <[email protected]> * folly: remove a leftover comment in conan_deps.cmake --------- Signed-off-by: Uilian Ries <[email protected]> Co-authored-by: Xianda Ke <[email protected]> Co-authored-by: Pau Farre <[email protected]> Co-authored-by: Pau Farré <[email protected]> Co-authored-by: Chris Mc <[email protected]> Co-authored-by: Uilian Ries <[email protected]> Co-authored-by: Luis Caro Campos <[email protected]>

kexianda and others added 30 commits November 14, 2023 09:33

folly: bumpup version & conan v2 support

b2930e0

* bumpup to v20221031.00 * conan v2 support * only include needed boost components, not all the boost components, to avoid static link order issue in some cases. * remove cmake version limitation

attach shell script for convenience

c08e8a5

minor fix & fix lint warning

4520748

backport latest fix for generator expr

b9a4880

support conan-v1 cmake_find_package/cmake_find_package_multi generator

8de0b18

fix libunwind

6032b67

bugfix: enable CMP0077

09aceb7

fix issues on windows

8728fe0

More modernize

6793405

Handle stdc++fs

93842da

Bump zlib to 1.2.13

b4de0a1

Handle case where compiler.cppstd is not provided, compiler minimal c…

8388be3

…hecks pass, but default_cppstd is lower than minimal_cppstd

Revert CMAKE_POSITION_INDEPENDENT_CODE removal

15f5ac2

Remove duplication in test_package

a2dc51a

Prefer official release artifacts

852e3aa

Change patch_type of PR folly/pull/1433 from backport to portability

ae19ea1

Bump libunwind requirement to 1.6.2

5fe2a60

Prune imports

c1caee5

Co-authored-by: Chris Mc <[email protected]>

Instead of invalidating configuration if default_cppstd is lower than…

77b3680

… min_cppstd, set min_cppstd if the compiler supports it

Bump required openssl to openssl/1.1.1s

ee9a560

Remove default_cppstd checks and default to min_cppstd if user doesn'…

198cee9

…t provide compiler.cppstd

Apply suggestions from code review

2b5004d

Co-authored-by: Chris Mc <[email protected]>

Improve test_package

2e05990

Add patch for missing limits include

6e1f423

Set BOOST_LINK_STATIC

e756712

Which in turn sets FOLLY_BOOST_LINK_STATIC, which ends up setting Boost_USE_STATIC_LIBS

Set policy CMP0074

bd04694

Switch to f-strings

28f98e1

Make sure it uses cmake >= 3.13

4fcb38e

Folly 2022.01.31 & 2022.10.31 build on Macos armv8

d114b2f

Disable windows

03e81ba

uilianries added 5 commits August 20, 2024 12:11

Drop libaio dependency

09cefbb

Signed-off-by: Uilian Ries <[email protected]>

Simplify cpp flag for windows

f9ce3ed

Signed-off-by: Uilian Ries <[email protected]>

Avoid generating .pc file

4b4b95c

Signed-off-by: Uilian Ries <[email protected]>

Avoid using fmt-11 patch

37a4502

Signed-off-by: Uilian Ries <[email protected]>

Revert "Avoid using fmt-11 patch"

57abdc0

This reverts commit 37a4502.

This comment has been minimized.

Sign in to view

Downgrade fmt to 10

2207f41

Signed-off-by: Uilian Ries <[email protected]>

This comment has been minimized.

Sign in to view

remove patch from conandata

2875fd7

Signed-off-by: Uilian Ries <[email protected]>

conan-center-bot removed the Failed label Aug 21, 2024

This comment has been minimized.

Sign in to view

Merge remote-tracking branch 'upstream/master' into folly-modernizati…

ec7acef

…on-followup

folly: use a version range for zstd, bump liburing

2eb919d

Revert "folly: use a version range for zstd, bump liburing"

90c54d2

This reverts commit 2eb919d.

This comment has been minimized.

Sign in to view

jcar87 reviewed Aug 21, 2024

View reviewed changes

recipes/folly/all/conan_deps.cmake Outdated Show resolved Hide resolved

do not enforce cmake prefix path in deps.cmake

1d2f485

Co-authored-by: Luis Caro Campos <[email protected]>

valgur commented Aug 21, 2024

View reviewed changes

recipes/folly/all/conan_deps.cmake Outdated Show resolved Hide resolved

folly: remove a leftover comment in conan_deps.cmake

8a47351

Hopobcn approved these changes Aug 21, 2024

View reviewed changes

AbrilRBS approved these changes Aug 22, 2024

View reviewed changes

AbrilRBS reviewed Aug 22, 2024

View reviewed changes

uilianries approved these changes Aug 22, 2024

View reviewed changes

conan-center-bot merged commit 8eff1ad into conan-io:master Aug 22, 2024
12 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

folly: migrate to Conan v2 #21109

folly: migrate to Conan v2 #21109

valgur commented Nov 14, 2023 •

edited

Loading

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

uilianries commented Aug 21, 2024

valgur commented Aug 21, 2024

uilianries commented Aug 21, 2024 •

edited

Loading

This comment has been minimized.

uilianries commented Aug 21, 2024

conan-center-bot commented Aug 21, 2024

Hopobcn left a comment

AbrilRBS Aug 22, 2024

uilianries Aug 22, 2024

uilianries left a comment

folly: migrate to Conan v2 #21109

folly: migrate to Conan v2 #21109

Conversation

valgur commented Nov 14, 2023 • edited Loading

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

uilianries commented Aug 21, 2024

valgur commented Aug 21, 2024

uilianries commented Aug 21, 2024 • edited Loading

This comment has been minimized.

uilianries commented Aug 21, 2024

conan-center-bot commented Aug 21, 2024

Conan v1 pipeline ✔️

Conan v2 pipeline ✔️

Hopobcn left a comment

Choose a reason for hiding this comment

AbrilRBS Aug 22, 2024

Choose a reason for hiding this comment

uilianries Aug 22, 2024

Choose a reason for hiding this comment

uilianries left a comment

Choose a reason for hiding this comment

valgur commented Nov 14, 2023 •

edited

Loading

uilianries commented Aug 21, 2024 •

edited

Loading