Skip to content

Commit

Permalink
Avoid using fmt-11 patch
Browse files Browse the repository at this point in the history
Signed-off-by: Uilian Ries <uilianries@gmail.com>
  • Loading branch information
uilianries committed Aug 20, 2024
1 parent 4b4b95c commit 37a4502
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 21 deletions.
6 changes: 0 additions & 6 deletions recipes/folly/all/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,3 @@ sources:
"2024.08.12.00":
url: "https://github.com/facebook/folly/releases/download/v2024.08.12.00/folly-v2024.08.12.00.tar.gz"
sha256: "18d7be721721db547cb9c5dd5cc50df05cd88b0a8e683e3126ec6f9ce2c41c4d"
patches:
"2024.08.12.00":
- patch_file: "patches/0001-support-fmt11.patch"
patch_source: "https://github.com/facebook/folly/issues/2250"
patch_type: "portabilty"
patch_description: "Fix CMake generator expression for fmt-11"
4 changes: 1 addition & 3 deletions recipes/folly/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from conan.tools.build import check_min_cppstd, cross_building
from conan.tools.env import VirtualBuildEnv
from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
from conan.tools.files import get, copy, rmdir, replace_in_file, save, rm, export_conandata_patches, apply_conandata_patches
from conan.tools.files import get, copy, rmdir, replace_in_file, save, rm
from conan.tools.microsoft import is_msvc, is_msvc_static_runtime
from conan.tools.scm import Version
import os
Expand Down Expand Up @@ -48,7 +48,6 @@ def _compilers_minimum_version(self):
}

def export_sources(self):
export_conandata_patches(self)
copy(self, "conan_deps.cmake", self.recipe_folder, os.path.join(self.export_sources_folder, "src"))

def config_options(self):
Expand Down Expand Up @@ -200,7 +199,6 @@ def generate(self):
deps.generate()

def _patch_sources(self):
apply_conandata_patches(self)
# Make sure will consume Conan dependencies
folly_deps = os.path.join(self.source_folder, "CMake", "folly-deps.cmake")
replace_in_file(self, folly_deps, " MODULE", " REQUIRED CONFIG")
Expand Down
12 changes: 0 additions & 12 deletions recipes/folly/all/patches/0001-support-fmt11.patch

This file was deleted.

0 comments on commit 37a4502

Please sign in to comment.