Skip to content

Commit 736e7c1

Browse files
rsync: Fix compilation options (#28347) (#28348)
* Fix rsync compilation options (#28347) * Fix with_xxhash * Revert minimum required and zstd version range --------- Co-authored-by: PerseoGI <[email protected]>
1 parent 54ee249 commit 736e7c1

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

recipes/rsync/all/conanfile.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ class RsyncConan(ConanFile):
3434
"with_lz4": True,
3535
"enable_acl": False
3636
}
37-
37+
languages = "C"
38+
3839
def configure(self):
3940
self.settings.rm_safe("compiler.libcxx")
4041
self.settings.rm_safe("compiler.cppstd")
@@ -56,7 +57,7 @@ def requirements(self):
5657
self.requires("zlib/[>=1.2.11 <2]")
5758

5859
if self.options.with_zstd:
59-
self.requires("zstd/1.5.5")
60+
self.requires("zstd/[>=1.5.5 <1.6]")
6061

6162
if self.options.with_lz4:
6263
self.requires("lz4/1.9.2")
@@ -81,10 +82,9 @@ def generate(self):
8182
f"--enable-acl-support={yes_no(self.options.enable_acl)}",
8283
f"--with-included-zlib={yes_no(not self.options.with_zlib)}",
8384
"--disable-openssl" if not self.options.with_openssl else "--enable-openssl",
84-
f"--with-zstd={yes_no(self.options.with_zstd)}",
85-
f"--with-lz4={yes_no(self.options.with_lz4)}",
86-
f"--with-xxhash={yes_no(self.options.with_xxhash)}",
87-
85+
"--disable-zstd" if not self.options.with_zstd else "--enable-zstd",
86+
"--disable-lz4" if not self.options.with_lz4 else "--enable-lz4",
87+
"--disable-xxhash" if not self.options.with_xxhash else "--enable-xxhash",
8888
"--enable-manpages=no",
8989
])
9090

0 commit comments

Comments
 (0)