zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

proj: fix installation of datum grid with Autotools (#36906)

Browse Source
This commit is contained in:
Sergey Kosukhin
2023-04-15 00:18:21 +02:00
committed by GitHub
parent 4d11001046
commit 5efd689803
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
var/spack/repos/builtin/packages/proj/package.py
View File

@@ -3,6 +3,7 @@
# #
# SPDX-License-Identifier: (Apache-2.0 OR MIT) # SPDX-License-Identifier: (Apache-2.0 OR MIT)
import spack.builder
from spack.build_systems import autotools, cmake from spack.build_systems import autotools, cmake
from spack.package import * from spack.package import *
@@ -105,7 +106,7 @@ def setup_dependent_run_environment(self, env, dependent_spec):
self.setup_run_environment(env) self.setup_run_environment(env)
class BaseBuilder: class BaseBuilder(metaclass=spack.builder.PhaseCallbacksMeta):
def setup_dependent_build_environment(self, env, dependent_spec): def setup_dependent_build_environment(self, env, dependent_spec):
self.pkg.setup_run_environment(env) self.pkg.setup_run_environment(env)
@@ -117,7 +118,7 @@ def install_datum_grids(self):
install_tree(join_path("share", "proj"), self.prefix.share.proj) install_tree(join_path("share", "proj"), self.prefix.share.proj)
class CMakeBuilder(cmake.CMakeBuilder, BaseBuilder): class CMakeBuilder(BaseBuilder, cmake.CMakeBuilder):
def cmake_args(self): def cmake_args(self):
args = [ args = [
self.define_from_variant("ENABLE_TIFF", "tiff"), self.define_from_variant("ENABLE_TIFF", "tiff"),
@@ -128,7 +129,7 @@ def cmake_args(self):
return args return args
class AutotoolsBuilder(autotools.AutotoolsBuilder, BaseBuilder): class AutotoolsBuilder(BaseBuilder, autotools.AutotoolsBuilder):
def configure_args(self): def configure_args(self):
args = [] args = []