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.

Sign up for GitHub

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

minizip: generate gcc11 binaries #12707

Merged
merged 3 commits into from
Sep 3, 2022
Merged

minizip: generate gcc11 binaries #12707

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51b17a6
minizip: generate gcc11 binaries
ericLemanissier Aug 31, 2022
4029b91
Update conanfile.py
ericLemanissier Aug 31, 2022
b462593
Update recipes/minizip/all/conanfile.py
ericLemanissier Aug 31, 2022
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
24 changes: 12 additions & 12 deletions recipes/minizip/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
from conans import ConanFile, tools, CMake
from conan import ConanFile
from conan.tools import files
from conans import CMake
import functools
import os

required_conan_version = ">=1.33.0"
required_conan_version = ">=1.46.0"


class MinizipConan(ConanFile):
Expand Down Expand Up @@ -54,7 +55,7 @@ def requirements(self):
self.requires("bzip2/1.0.8")

def source(self):
tools.get(**self.conan_data["sources"][self.version],
files.get(self, **self.conan_data["sources"][self.version],
destination=self._source_subfolder, strip_root=True)

@functools.lru_cache(1)
Expand All @@ -66,16 +67,15 @@ def _configure_cmake(self):
return cmake

def build(self):
for patch in self.conan_data.get("patches", {}).get(self.version, []):
tools.patch(**patch)
files.apply_conandata_patches(self)
cmake = self._configure_cmake()
cmake.build()

def _extract_license(self):
with tools.chdir(os.path.join(self.source_folder, self._source_subfolder)):
tmp = tools.load("zlib.h")
with files.chdir(self, f"{self.source_folder}/{self._source_subfolder}"):
tmp = files.load(self, "zlib.h")
license_contents = tmp[2:tmp.find("*/", 1)]
tools.save("LICENSE", license_contents)
files.save(self, "LICENSE", license_contents)

def package(self):
self._extract_license()
Expand All @@ -85,11 +85,11 @@ def package(self):

def package_info(self):
self.cpp_info.libs = ["minizip"]
self.cpp_info.includedirs = ["include", os.path.join("include", "minizip")]
self.cpp_info.includedirs = ["include", "include/minizip"]
if self.options.bzip2:
self.cpp_info.defines.append("HAVE_BZIP2")

if self.options.tools:
bin_path = os.path.join(self.package_folder, "bin")
self.output.info("Appending PATH environment variable: {}".format(bin_path))
bin_path = f"{self.package_folder}/bin"
self.output.info(f"Appending PATH environment variable: {bin_path}")
self.env_info.PATH.append(bin_path)