Conan/conan-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[DO-1345] fixed windows packages (!16)

Browse Source 
Reviewed-on: https://git.avroid.tech/Conan/conan_build/pulls/16
Co-authored-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.team>
Co-committed-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.team>
This commit is contained in:
aleksandr.vodyanov
2025-02-25 13:53:43 +03:00
committed by Aleksandr Vodyanov
parent 3759e1163f
commit a82e89a1bc
46 changed files with 679 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
recipes/xz_utils/all/conanfile.py
View File

@@ -1,12 +1,11 @@
from conan import ConanFile
from conan.tools.apple import fix_apple_shared_install_name
from conan.tools.build import cross_building
from conan.tools.env import VirtualBuildEnv
from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, rename, replace_in_file, rm, rmdir, save, chdir
from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, rename, replace_in_file, rm, rmdir, save
from conan.tools.gnu import Autotools, AutotoolsToolchain
from conan.tools.layout import basic_layout
from conan.tools.microsoft import is_msvc, is_msvc_static_runtime, MSBuild, MSBuildToolchain
from conan.tools.scm import Version, Git
from conan.tools.scm import Version
import os
import textwrap
@@ -82,11 +81,7 @@ class XZUtilsConan(ConanFile):
self.tool_requires("msys2/cci.latest")
def source(self):
#get(self, **self.conan_data["sources"][self.version], strip_root=True)
git = Git(self)
sources = self.conan_data["sources"][self.version]
clone_args = ['--depth', '1', '--branch', sources["branch"]]
git.clone(url=sources["url"], target=self.source_folder, args=clone_args)
get(self, **self.conan_data["sources"][self.version], strip_root=True)
def generate(self):
if self._use_msbuild:
@@ -100,13 +95,6 @@ class XZUtilsConan(ConanFile):
tc.configure_args.append("--disable-doc")
if self.settings.build_type == "Debug":
tc.configure_args.append("--enable-debug")
if cross_building(self) and self.settings.os == "Windows":
tc.configure_args.append("--disable-dependency-tracking")
tc.configure_args.append("--disable-nls")
tc.configure_args.append("--disable-scripts")
tc.configure_args.append("--disable-threads")
tc.configure_args.append("--enable-small")
tc.configure_args.append("CFLAGS=-march=x86-64 -mtune=generic")
tc.generate()
@property
@@ -163,8 +151,6 @@ class XZUtilsConan(ConanFile):
if self._use_msbuild:
self._build_msvc()
else:
with chdir(self, self.source_folder):
self.run("./autogen.sh --no-po4a --no-doxygen")
autotools = Autotools(self)
autotools.configure()
autotools.make()