From 5efd6898036fc50275dc312b7941ec56909ff17f Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Sat, 15 Apr 2023 00:18:21 +0200 Subject: proj: fix installation of datum grid with Autotools (#36906) --- var/spack/repos/builtin/packages/proj/package.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/proj/package.py b/var/spack/repos/builtin/packages/proj/package.py index a4006aa67a..6c62df373f 100644 --- a/var/spack/repos/builtin/packages/proj/package.py +++ b/var/spack/repos/builtin/packages/proj/package.py @@ -3,6 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +import spack.builder from spack.build_systems import autotools, cmake from spack.package import * @@ -105,7 +106,7 @@ class Proj(CMakePackage, AutotoolsPackage): self.setup_run_environment(env) -class BaseBuilder: +class BaseBuilder(metaclass=spack.builder.PhaseCallbacksMeta): def setup_dependent_build_environment(self, env, dependent_spec): self.pkg.setup_run_environment(env) @@ -117,7 +118,7 @@ class BaseBuilder: install_tree(join_path("share", "proj"), self.prefix.share.proj) -class CMakeBuilder(cmake.CMakeBuilder, BaseBuilder): +class CMakeBuilder(BaseBuilder, cmake.CMakeBuilder): def cmake_args(self): args = [ self.define_from_variant("ENABLE_TIFF", "tiff"), @@ -128,7 +129,7 @@ class CMakeBuilder(cmake.CMakeBuilder, BaseBuilder): return args -class AutotoolsBuilder(autotools.AutotoolsBuilder, BaseBuilder): +class AutotoolsBuilder(BaseBuilder, autotools.AutotoolsBuilder): def configure_args(self): args = [] -- cgit v1.2.3-70-g09d2