From 2a3cb93885141024c1b405a01a79fb3abc239b12 Mon Sep 17 00:00:00 2001 From: Denis Kovalchuk Date: Sat, 7 Dec 2024 13:04:13 +0300 Subject: [PATCH] libftp: add version 1.4.0 (#26122) * libftp: add version 1.4.0 * libftp: add support for building a shared library using MSVC libftp release notes [1]: "Added support for creating the shared library on Windows." [1] https://github.com/deniskovalchuk/libftp/releases/tag/v1.4.0 --- recipes/libftp/all/conandata.yml | 3 +++ recipes/libftp/all/conanfile.py | 2 +- recipes/libftp/config.yml | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes/libftp/all/conandata.yml b/recipes/libftp/all/conandata.yml index fb2299e0d19a5..1df2b6440cd9a 100644 --- a/recipes/libftp/all/conandata.yml +++ b/recipes/libftp/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.4.0": + url: "https://github.com/deniskovalchuk/libftp/archive/refs/tags/v1.4.0.tar.gz" + sha256: "0d8c9f8ea36ef010c4b7be79e3c4ad46830d2f644bcecd608d83f69274a2aa9e" "1.3.0": url: "https://github.com/deniskovalchuk/libftp/archive/refs/tags/v1.3.0.tar.gz" sha256: "e4861fccb5c67742db1aa8f1af98ac70888b54212b06a8366d84a040897ca749" diff --git a/recipes/libftp/all/conanfile.py b/recipes/libftp/all/conanfile.py index 7669d367c9256..9ead6038cf850 100644 --- a/recipes/libftp/all/conanfile.py +++ b/recipes/libftp/all/conanfile.py @@ -29,7 +29,7 @@ class LibFTPConan(ConanFile): implements = ["auto_shared_fpic"] def configure(self): - if is_msvc(self): + if Version(self.version) < "1.4.0" and is_msvc(self): del self.options.shared self.package_type = "static-library" if self.options.get_safe("shared"): diff --git a/recipes/libftp/config.yml b/recipes/libftp/config.yml index bcb0309be3cae..fc2acdcc60347 100644 --- a/recipes/libftp/config.yml +++ b/recipes/libftp/config.yml @@ -1,4 +1,6 @@ versions: + "1.4.0": + folder: all "1.3.0": folder: all "1.1.0":