From 7893be7712ed709f6136ac83f49afc3d718d5ddc Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Sat, 9 Apr 2022 23:07:59 +0200 Subject: [PATCH] musl: remove custom phases, add v1.2.3 (#29985) --- var/spack/repos/builtin/packages/musl/package.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/var/spack/repos/builtin/packages/musl/package.py b/var/spack/repos/builtin/packages/musl/package.py index 726e7db90e..f5312dbb41 100644 --- a/var/spack/repos/builtin/packages/musl/package.py +++ b/var/spack/repos/builtin/packages/musl/package.py @@ -6,7 +6,7 @@ from spack import * -class Musl(Package): +class Musl(MakefilePackage): """Musl is a libc, an implementation of the standard library functionality described in the ISO C and POSIX standards, plus common extensions, intended for use on Linux-based systems. Whereas the kernel @@ -26,6 +26,7 @@ class Musl(Package): homepage = "https://www.musl-libc.org" url = "https://www.musl-libc.org/releases/musl-1.1.23.tar.gz" + version('1.2.3', sha256='7d5b0b6062521e4627e099e4c9dc8248d32a30285e959b7eecaa780cf8cfd4a4') version('1.2.2', sha256='9b969322012d796dc23dda27a35866034fa67d8fb67e0e2c45c913c3d43219dd') version('1.2.1', sha256='68af6e18539f646f9c41a3a2bb25be4a5cfa5a8f65f0bb647fd2bbfdf877e84b') version('1.2.0', sha256='c6de7b191139142d3f9a7b5b702c9cae1b5ee6e7f57e582da9328629408fd4e8') @@ -35,8 +36,6 @@ class Musl(Package): version('1.1.21', sha256='c742b66f6f49c9e5f52f64d8b79fecb5a0f6e0203fca176c70ca20f6be285f44') version('1.1.20', sha256='44be8771d0e6c6b5f82dd15662eb2957c9a3173a19a8b49966ac0542bbd40d61') - phases = ['configure', 'build', 'install'] - def patch(self): config = FileFilter('configure') if self.compiler.name == 'gcc': @@ -57,11 +56,5 @@ def configure_args(self): args.append('--syslibdir={0}'.format(self.prefix.lib)) return args - def configure(self, spec, prefix): + def edit(self, spec, prefix): configure(*self.configure_args()) - - def build(self, spec, prefix): - make() - - def install(self, spec, prefix): - make('install')