Skip to content

Commit

Permalink
Restore static openssl support for subversion
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexanderRichert-NOAA committed Oct 3, 2023
1 parent 8544a87 commit 980588d
Showing 1 changed file with 12 additions and 7 deletions.
19 changes: 12 additions & 7 deletions var/spack/repos/builtin/packages/subversion/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,18 @@ def configure_args(self):

if "+nls" in spec:
args.append("--enable-nls")
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")
if not is_system_path(spec["gettext"].prefix):
args.append("LDFLAGS={0}".format(spec["gettext"].libs.search_flags))
ldflags = []
if not is_system_path(spec["gettext"].prefix):
ldflags.append(spec["gettext"].libs.search_flags)
# 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 specify it by hand here.
libs = ["-lintl"]
if spec["gettext"].satisfies("~shared"):
ldflags.append(spec["iconv"].libs.search_flags)
libs.append(spec["iconv"].libs.link_flags)
args.append("LDFLAGS=%s" % " ".join(ldflags))
args.append("LIBS=%s" % " ".join(libs))
else:
args.append("--disable-nls")

Expand Down

0 comments on commit 980588d

Please sign in to comment.