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.

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

thrift: add v0.19.0, drop old versions, bump deps #21334

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 10 additions & 21 deletions recipes/thrift/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"0.19.0":
url: "http://archive.apache.org/dist/thrift/0.19.0/thrift-0.19.0.tar.gz"
sha256: "d49c896c2724a78701e05cfccf6cf70b5db312d82a17efe951b441d300ccf275"
"0.18.1":
url: "http://archive.apache.org/dist/thrift/0.18.1/thrift-0.18.1.tar.gz"
sha256: "04c6f10e5d788ca78e13ee2ef0d2152c7b070c0af55483d6b942e29cff296726"
Expand All @@ -8,16 +11,14 @@ sources:
"0.16.0":
url: "http://archive.apache.org/dist/thrift/0.16.0/thrift-0.16.0.tar.gz"
sha256: "f460b5c1ca30d8918ff95ea3eb6291b3951cf518553566088f3f2be8981f6209"
"0.15.0":
url: "http://archive.apache.org/dist/thrift/0.15.0/thrift-0.15.0.tar.gz"
sha256: "d5883566d161f8f6ddd4e21f3a9e3e6b8272799d054820f1c25b11e86718f86b"
"0.14.2":
url: "http://archive.apache.org/dist/thrift/0.14.2/thrift-0.14.2.tar.gz"
sha256: "4191bfc0b7490e20cc69f9f4dc6e991fbb612d4551aa9eef1dbf7f4c47ce554d"
"0.14.1":
url: "http://archive.apache.org/dist/thrift/0.14.1/thrift-0.14.1.tar.gz"
sha256: "13da5e1cd9c8a3bb89778c0337cc57eb0c29b08f3090b41cf6ab78594b410ca5"
patches:
"0.19.0":
- patch_file: "patches/cmake-0.16.0.patch"
patch_description: "use cci packages"
patch_type: "conan"
- patch_file: "patches/0.18.1-0002-include-stddef.patch"
patch_description: "include cstddef"
patch_type: "portability"
"0.18.1":
- patch_file: "patches/cmake-0.16.0.patch"
patch_description: "use cci packages"
Expand All @@ -33,15 +34,3 @@ patches:
- patch_file: "patches/cmake-0.16.0.patch"
patch_description: "use cci packages"
patch_type: "conan"
"0.15.0":
- patch_file: "patches/cmake-0.15.0.patch"
patch_description: "use cci packages"
patch_type: "conan"
"0.14.2":
- patch_file: "patches/cmake-0.14.1.patch"
patch_description: "use cci packages"
patch_type: "conan"
"0.14.1":
- patch_file: "patches/cmake-0.14.1.patch"
patch_description: "use cci packages"
patch_type: "conan"
10 changes: 4 additions & 6 deletions recipes/thrift/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from conan.tools.env import VirtualBuildEnv
from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, replace_in_file, rm, rmdir, save
from conan.tools.microsoft import is_msvc, is_msvc_static_runtime
from conan.tools.scm import Version
import os
import textwrap

Expand Down Expand Up @@ -67,19 +66,19 @@ def layout(self):
cmake_layout(self, src_folder="src")

def requirements(self):
self.requires("boost/1.82.0", transitive_headers=True)
self.requires("boost/1.83.0", transitive_headers=True)
if self.options.with_openssl:
self.requires("openssl/[>=1.1 <4]")
if self.options.with_zlib:
self.requires("zlib/[>=1.2.11 <2]")
if self.options.with_libevent:
self.requires("libevent/2.1.12")
if self.options.with_qt5:
self.requires("qt/5.15.9")
self.requires("qt/5.15.11")

def build_requirements(self):
if self._settings_build.os == "Windows":
self.tool_requires("winflexbison/2.5.24")
self.tool_requires("winflexbison/2.5.25")
else:
self.tool_requires("flex/2.6.4")
self.tool_requires("bison/3.8.2")
Expand Down Expand Up @@ -176,8 +175,7 @@ def package_info(self):
self.cpp_info.components["libthrift"].libs = [f"thrift{libsuffix}"]
if self.settings.os == "Windows":
self.cpp_info.components["libthrift"].defines.append("NOMINMAX")
if Version(self.version) >= "0.15.0":
self.cpp_info.components["libthrift"].system_libs.append("shlwapi")
self.cpp_info.components["libthrift"].system_libs.append("shlwapi")
elif self.settings.os in ["Linux", "FreeBSD"]:
self.cpp_info.components["libthrift"].system_libs.extend(["m", "pthread"])
self.cpp_info.components["libthrift"].requires.append("boost::headers")
Expand Down
80 changes: 0 additions & 80 deletions recipes/thrift/all/patches/cmake-0.13.0.patch

This file was deleted.

108 changes: 0 additions & 108 deletions recipes/thrift/all/patches/cmake-0.14.1.patch

This file was deleted.

116 changes: 0 additions & 116 deletions recipes/thrift/all/patches/cmake-0.15.0.patch

This file was deleted.

Loading