Skip to content

Commit

Permalink
(#6356) libdeflate: add 1.8 + bump msys2 + modernize
Browse files Browse the repository at this point in the history
* add libdeflate/1.8

* no os.rename

* bump msys2
  • Loading branch information
SpaceIm authored Jul 16, 2021
1 parent 816406c commit 9b7746a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
3 changes: 3 additions & 0 deletions recipes/libdeflate/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"1.8":
url: "https://github.com/ebiggers/libdeflate/archive/refs/tags/v1.8.tar.gz"
sha256: "50711ad4e9d3862f8dfb11b97eb53631a86ee3ce49c0e68ec2b6d059a9662f61"
"1.7":
url: "https://github.com/ebiggers/libdeflate/archive/v1.7.tar.gz"
sha256: "a5e6a0a9ab69f40f0f59332106532ca76918977a974e7004977a9498e3f11350"
8 changes: 5 additions & 3 deletions recipes/libdeflate/all/conanfile.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
from conans import ConanFile, AutoToolsBuildEnvironment, VisualStudioBuildEnvironment, tools
import os

required_conan_version = ">=1.33.0"


class LibdeflateConan(ConanFile):
name = "libdeflate"
Expand Down Expand Up @@ -31,11 +33,11 @@ def configure(self):
def build_requirements(self):
if tools.os_info.is_windows and self.settings.compiler != "Visual Studio" and \
not tools.get_env("CONAN_BASH_PATH"):
self.build_requires("msys2/20200517")
self.build_requires("msys2/cci.latest")

def source(self):
tools.get(**self.conan_data["sources"][self.version])
os.rename(self.name + "-" + self.version, self._source_subfolder)
tools.get(**self.conan_data["sources"][self.version],
destination=self._source_subfolder, strip_root=True)

def _build_msvc(self):
makefile_msc_file = os.path.join(self._source_subfolder, "Makefile.msc")
Expand Down
2 changes: 2 additions & 0 deletions recipes/libdeflate/config.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
versions:
"1.8":
folder: all
"1.7":
folder: all

0 comments on commit 9b7746a

Please sign in to comment.