summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorSergey Kosukhin <sergey.kosukhin@mpimet.mpg.de>2023-04-15 00:18:21 +0200
committerGitHub <noreply@github.com>2023-04-14 18:18:21 -0400
commit5efd6898036fc50275dc312b7941ec56909ff17f (patch)
treeb905ee063566ccd1878b54fd2b1b18649d54e24c /var
parent4d1100104681db1e0a85e7300efc66ea3c055399 (diff)
downloadspack-5efd6898036fc50275dc312b7941ec56909ff17f.tar.gz
spack-5efd6898036fc50275dc312b7941ec56909ff17f.tar.bz2
spack-5efd6898036fc50275dc312b7941ec56909ff17f.tar.xz
spack-5efd6898036fc50275dc312b7941ec56909ff17f.zip
proj: fix installation of datum grid with Autotools (#36906)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/proj/package.py7
1 files changed, 4 insertions, 3 deletions
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 = []