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

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

View File

@@ -1,25 +1,33 @@
sources:
"5.4.5":
url: "ssh://git@git.avroid.tech:2222/Mirrors/xz"
branch: "v5.4.5"
url:
- "https://nexus.avroid.tech/repository/all-raw-proxy-tukaani_org/xz/xz-5.4.5.tar.xz"
sha256: "da9dec6c12cf2ecf269c31ab65b5de18e8e52b96f35d5bcd08c12b43e6878803"
"5.4.4":
url: "ssh://git@git.avroid.tech:2222/Mirrors/xz"
branch: "v5.4.4"
url:
- "https://nexus.avroid.tech/repository/all-raw-proxy-tukaani_org/xz/xz-5.4.4.tar.gz"
sha256: "aae39544e254cfd27e942d35a048d592959bd7a79f9a624afb0498bb5613bdf8"
"5.4.2":
url: "ssh://git@git.avroid.tech:2222/Mirrors/xz"
branch: "v5.4.2"
url:
- "https://nexus.avroid.tech/repository/all-raw-proxy-tukaani_org/xz/xz-5.4.2.tar.gz"
- "https://c3i.jfrog.io/artifactory/conan-center-backup-sources/87947679abcf77cc509d8d1b474218fd16b72281e2797360e909deaee1ac9d05"
sha256: "87947679abcf77cc509d8d1b474218fd16b72281e2797360e909deaee1ac9d05"
"5.4.0":
url: "ssh://git@git.avroid.tech:2222/Mirrors/xz"
branch: "v5.4.0"
url:
- "https://nexus.avroid.tech/repository/all-raw-proxy-tukaani_org/xz/xz-5.4.0.tar.gz"
sha256: "7471ef5991f690268a8f2be019acec2e0564b7b233ca40035f339fe9a07f830b"
"5.2.10":
url: "ssh://git@git.avroid.tech:2222/Mirrors/xz"
branch: "v5.2.10"
url:
- "https://nexus.avroid.tech/repository/all-raw-proxy-tukaani_org/xz/xz-5.2.10.tar.gz"
sha256: "eb7a3b2623c9d0135da70ca12808a214be9c019132baaa61c9e1d198d1d9ded3"
"5.2.5":
url: "ssh://git@git.avroid.tech:2222/Mirrors/xz"
branch: "v5.2.5"
url:
- "https://nexus.avroid.tech/repository/all-raw-proxy-tukaani_org/xz/xz-5.2.5.tar.gz"
sha256: "f6f4910fd033078738bd82bfba4f49219d03b17eb0794eb91efbae419f4aba10"
"5.2.4":
url: "ssh://git@git.avroid.tech:2222/Mirrors/xz"
branch: "v5.2.4"
url:
- "https://nexus.avroid.tech/repository/all-raw-proxy-tukaani_org/xz/xz-5.2.4.tar.gz"
sha256: "b512f3b726d3b37b6dc4c8570e137b9311e7552e8ccbab4d39d47ce5f4177145"
patches:
"5.2.4":
- patch_file: "patches/0001-relax_windows-sdk-restriction.patch"

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()