Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update proj from spack develop as of 2023/10/17 #347

Merged
merged 3 commits into from
Oct 18, 2023
Merged

Update proj from spack develop as of 2023/10/17 #347

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
139027f
Update var/spack/repos/builtin/packages/proj/package.py from spack/de…
climbfuji Oct 17, 2023
1a2b6b0
Merge branch 'jcsda_emc_spack_stack' of https://github.com/jcsda/spac…
climbfuji Oct 18, 2023
e6cc64c
Merge branch 'jcsda_emc_spack_stack' of https://github.com/jcsda/spac…
climbfuji Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion var/spack/repos/builtin/packages/proj/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class Proj(CMakePackage, AutotoolsPackage):
# Many packages that depend on proj do not yet support the newer API.
# See https://github.com/OSGeo/PROJ/wiki/proj.h-adoption-status

version("9.2.1", sha256="15ebf4afa8744b9e6fccb5d571fc9f338dc3adcf99907d9e62d1af815d4971a1")
version("9.2.0", sha256="dea816f5aa732ae6b2ee3977b9bdb28b1d848cf56a1aad8faf6708b89f0ed50e")
version("9.1.1", sha256="003cd4010e52bb5eb8f7de1c143753aa830c8902b6ed01209f294846e40e6d39")
version("9.1.0", sha256="81b2239b94cad0886222cde4f53cb49d34905aad2a1317244a0c30a553db2315")
Expand Down Expand Up @@ -78,6 +79,12 @@ class Proj(CMakePackage, AutotoolsPackage):
when="@:6",
)

patch(
"https://github.com/OSGeo/PROJ/commit/3f38a67a354a3a1e5cca97793b9a43860c380d95.patch?full_index=1",
sha256="dc620ff1bbcc0ef4130d53a40a8693a1e2e72ebf83bd6289f1139d0f1aad2a40",
when="@7:7.2.1",
)

# https://proj.org/install.html#build-requirements
with when("build_system=cmake"):
depends_on("[email protected]:", when="@6:", type="build")
Expand Down Expand Up @@ -125,6 +132,8 @@ def cmake_args(self):
args = [
self.define_from_variant("ENABLE_TIFF", "tiff"),
self.define_from_variant("ENABLE_CURL", "curl"),
self.define_from_variant("BUILD_SHARED_LIBS", "shared"),
self.define_from_variant("CMAKE_POSITION_INDEPENDENT_CODE", "pic"),
]
if self.spec.satisfies("@6:") and self.pkg.run_tests:
args.append(self.define("USE_EXTERNAL_GTEST", True))
Expand All @@ -149,7 +158,7 @@ def configure_args(self):
args.extend(self.enable_or_disable("shared"))
args.extend(self.with_or_without("pic"))

if self.spec["libtiff"].satisfies("+jpeg~shared"):
if self.spec.satisfies("^libtiff+jpeg~shared"):
args.append("LDFLAGS=%s" % self.spec["jpeg"].libs.ld_flags)
args.append("LIBS=%s" % self.spec["jpeg"].libs.link_flags)

Expand Down