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

Subversion: pic variant & static openssl #337

Merged
merged 5 commits into from
Oct 4, 2023
Merged

Subversion: pic variant & static openssl #337

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8544a87
Restore pic option for subversion
AlexanderRichert-NOAA Oct 3, 2023
980588d
Restore static openssl support for subversion
AlexanderRichert-NOAA Oct 3, 2023
35ded4f
Update package.py
AlexanderRichert-NOAA Oct 3, 2023
61628c4
Update package.py
AlexanderRichert-NOAA Oct 4, 2023
87e8b23
Merge branch 'jcsda_emc_spack_stack' into subversion_pic
AlexanderRichert-NOAA Oct 4, 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
17 changes: 14 additions & 3 deletions var/spack/repos/builtin/packages/subversion/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ class Subversion(AutotoolsPackage):
variant("perl", default=False, description="Build with Perl bindings")
variant("apxs", default=True, description="Build with APXS")
variant("nls", default=True, description="Enable Native Language Support")
variant("pic", default=False, description="Enable position-independent code")

depends_on("apr")
depends_on("apr-util")
Expand Down Expand Up @@ -77,6 +78,7 @@ def configure_args(self):
"--without-kwallet",
"--without-jdk",
"--without-boost",
self.with_or_without("pic")[0],
]

if spec.satisfies("@1.10:"):
Expand Down Expand Up @@ -105,13 +107,22 @@ def configure_args(self):

if "+nls" in spec:
args.append("--enable-nls")
ldflags = []
libs = []
if "intl" in spec["gettext"].libs.names:
# Using .libs.link_flags is the canonical way to add these arguments,
# but since libintl is much smaller than the rest and also the only
# necessary one, we would specify it by hand here
args.append("LIBS=-lintl")
# necessary one, we specify it by hand here.
libs.append("-lintl")
if not is_system_path(spec["gettext"].prefix):
args.append("LDFLAGS={0}".format(spec["gettext"].libs.search_flags))
ldflags.append(spec["gettext"].libs.search_flags)
if spec["gettext"].satisfies("~shared"):
ldflags.append(spec["iconv"].libs.search_flags)
libs.append(spec["iconv"].libs.link_flags)
if ldflags:
args.append("LDFLAGS=%s" % " ".join(ldflags))
if libs:
args.append("LIBS=%s" % " ".join(libs))
else:
args.append("--disable-nls")

Expand Down