Skip to content

Commit

Permalink
isa-l: add new cci.20230818 version for armv8 support
Browse files Browse the repository at this point in the history
  • Loading branch information
valgur committed Oct 24, 2023
1 parent cf6aae4 commit be5b6fa
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 1 deletion.
3 changes: 3 additions & 0 deletions recipes/isa-l/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"cci.20230818":
url: "https://github.com/intel/isa-l/archive/4815174a68bd197b48c19db45c77cf9f49008760.tar.gz"
sha256: "615d2fe8399c3fe6c91ed9ca1377710cf373a093a6b3f984754da706f012f6d6"
"2.30.0":
url: "https://github.com/intel/isa-l/archive/refs/tags/v2.30.0.tar.gz"
sha256: "bcf592c04fdfa19e723d2adf53d3e0f4efd5b956bb618fed54a1108d76a6eb56"
10 changes: 9 additions & 1 deletion recipes/isa-l/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

from conan import ConanFile
from conan.errors import ConanInvalidConfiguration
from conan.tools.env import VirtualBuildEnv
from conan.tools.files import chdir, collect_libs, copy, get, replace_in_file
from conan.tools.gnu import Autotools, AutotoolsToolchain
from conan.tools.layout import basic_layout
Expand Down Expand Up @@ -44,6 +45,8 @@ def layout(self):
def validate(self):
if self.settings.arch not in ["x86", "x86_64", "armv8"]:
raise ConanInvalidConfiguration("CPU Architecture not supported")
if self.version == "2.30.0" and self.settings.arch == "armv8":
raise ConanInvalidConfiguration("Version 2.30.0 does not support armv8")

def build_requirements(self):
self.tool_requires("nasm/2.15.05")
Expand All @@ -54,12 +57,17 @@ def source(self):
get(self, **self.conan_data["sources"][self.version], strip_root=True)

def generate(self):
env = VirtualBuildEnv(self)
env.generate()
if is_msvc(self):
tc = NMakeToolchain(self)
tc.generate()
else:
tc = AutotoolsToolchain(self)
tc.generate()
# ./configure bugs out if $AS executable has an absolute path
env = tc.environment()
env.define("AS", "nasm")
tc.generate(env)

def build(self):
with chdir(self, self.source_folder):
Expand Down
2 changes: 2 additions & 0 deletions recipes/isa-l/config.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
versions:
"cci.20230818":
folder: all
"2.30.0":
folder: all

0 comments on commit be5b6fa

Please sign in to comment.