summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Kaindl <43588962+bernhardkaindl@users.noreply.github.com>2021-10-13 20:42:18 +0200
committerGitHub <noreply@github.com>2021-10-13 20:42:18 +0200
commitf4a132256a2eadf5586e2b758ff64de602c21d6e (patch)
tree6c143d20519a1b9585fbbd41896404aa7d298564
parent2864212ae3ddbd00193121b1e14db951a6ab5606 (diff)
downloadspack-f4a132256a2eadf5586e2b758ff64de602c21d6e.tar.gz
spack-f4a132256a2eadf5586e2b758ff64de602c21d6e.tar.bz2
spack-f4a132256a2eadf5586e2b758ff64de602c21d6e.tar.xz
spack-f4a132256a2eadf5586e2b758ff64de602c21d6e.zip
qgis: fix build of LTS release with proj>7 (#26696)
Co-authored-by: Sinan <sbulutw@gmail.com> Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
-rw-r--r--var/spack/repos/builtin/packages/qgis/package.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/qgis/package.py b/var/spack/repos/builtin/packages/qgis/package.py
index ab7f60c91c..a0ef76b92b 100644
--- a/var/spack/repos/builtin/packages/qgis/package.py
+++ b/var/spack/repos/builtin/packages/qgis/package.py
@@ -161,7 +161,10 @@ class Qgis(CMakePackage):
self.spec['geos'].prefix.bin,
'-DGSL_CONFIG_PREFER_PATH=' + self.spec['gsl'].prefix.bin,
'-DPOSTGRES_CONFIG_PREFER_PATH=' +
- self.spec['postgresql'].prefix.bin
+ self.spec['postgresql'].prefix.bin,
+ '-DPROJ_INCLUDE_DIR=' + self.spec['proj'].headers.directories[0],
+ '-DSQLITE3_LIBRARY='
+ + self.spec['sqlite'].libs[0]
])
args.extend([
@@ -232,3 +235,7 @@ class Qgis(CMakePackage):
else:
args.append('-DWITH_GRASS7=OFF')
return args
+
+ def check(self):
+ """The tests of fail without access to an X server, cant run on build servers"""
+ pass