Skip to content

Commit

Permalink
isa-l: revert the addition of custom version
Browse files Browse the repository at this point in the history
  • Loading branch information
valgur committed Nov 24, 2023
1 parent b07d160 commit de1c136
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 7 deletions.
3 changes: 0 additions & 3 deletions recipes/isa-l/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
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"
4 changes: 2 additions & 2 deletions recipes/isa-l/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ def layout(self):

def validate(self):
if self.settings.arch not in ["x86", "x86_64"]:
raise ConanInvalidConfiguration("CPU Architecture not supported")
raise ConanInvalidConfiguration(f"{self.settings.arch} architecture is not supported")
if self.version == "2.30.0" and self.settings.arch == "armv8":
raise ConanInvalidConfiguration("Version 2.30.0 does not support armv8")
raise ConanInvalidConfiguration(f"Version {self.version} does not support armv8")

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

0 comments on commit de1c136

Please sign in to comment.