diff options
| author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2024-06-28 18:27:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-28 18:27:12 +0200 |
| commit | ddf8384bc60ea272f9eea25e53b470706e54d2a5 (patch) | |
| tree | 794ad442d9d048e89ec7b7b69a178c81c9d60fe1 | |
| parent | 670f92f42b70230acb1b4739122ef812a22636aa (diff) | |
| download | spack-ddf8384bc60ea272f9eea25e53b470706e54d2a5.tar.gz spack-ddf8384bc60ea272f9eea25e53b470706e54d2a5.tar.bz2 spack-ddf8384bc60ea272f9eea25e53b470706e54d2a5.tar.xz spack-ddf8384bc60ea272f9eea25e53b470706e54d2a5.zip | |
libgpg-error, libassuan: fixes for darwin (#44946)
| -rw-r--r-- | .github/workflows/ci.yaml | 7 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/libassuan/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/libgpg-error/package.py | 7 |
3 files changed, 17 insertions, 0 deletions
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ccb4aeed0d..7fbd015ca4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -53,6 +53,13 @@ jobs: - 'var/spack/repos/builtin/packages/clingo/**' - 'var/spack/repos/builtin/packages/python/**' - 'var/spack/repos/builtin/packages/re2c/**' + - 'var/spack/repos/builtin/packages/gnupg/**' + - 'var/spack/repos/builtin/packages/libassuan/**' + - 'var/spack/repos/builtin/packages/libgcrypt/**' + - 'var/spack/repos/builtin/packages/libgpg-error/**' + - 'var/spack/repos/builtin/packages/libksba/**' + - 'var/spack/repos/builtin/packages/npth/**' + - 'var/spack/repos/builtin/packages/pinentry/**' - 'lib/spack/**' - 'share/spack/**' - '.github/workflows/bootstrap.yml' diff --git a/var/spack/repos/builtin/packages/libassuan/package.py b/var/spack/repos/builtin/packages/libassuan/package.py index 0262ce6acb..01e12ba743 100644 --- a/var/spack/repos/builtin/packages/libassuan/package.py +++ b/var/spack/repos/builtin/packages/libassuan/package.py @@ -15,6 +15,7 @@ class Libassuan(AutotoolsPackage): license("LGPL-2.1-or-later") + version("3.0.1", sha256="c8f0f42e6103dea4b1a6a483cb556654e97302c7465308f58363778f95f194b1") version("3.0.0", sha256="0b160cbb898b852c6c04314b9a63e90ca87501305ad72a58a010f808665bbaf6") version("2.5.7", sha256="0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76") version("2.5.6", sha256="e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426") @@ -26,6 +27,8 @@ class Libassuan(AutotoolsPackage): depends_on("libgpg-error@1.17:") + conflicts("platform=darwin", when="@3") + def configure_args(self): return [ "--enable-static", diff --git a/var/spack/repos/builtin/packages/libgpg-error/package.py b/var/spack/repos/builtin/packages/libgpg-error/package.py index 4b4d4fe509..04bddad4b7 100644 --- a/var/spack/repos/builtin/packages/libgpg-error/package.py +++ b/var/spack/repos/builtin/packages/libgpg-error/package.py @@ -36,6 +36,13 @@ class LibgpgError(AutotoolsPackage): depends_on("awk", type="build") # Patch for using gawk@5, c.f. https://dev.gnupg.org/T4459 patch("awk-5.patch", when="@1.36^gawk@5:") + # See https://github.com/macports/macports-ports/pull/24601 and https://dev.gnupg.org/T7169 + patch( + "https://raw.githubusercontent.com/ryandesign/macports-ports/290e77cca6ce054768ddefee2b51222d72780ac9/devel/libgpg-error/files/patch-src-spawn-posix.c.diff", + sha256="0b2a0ffab81b2b0b40d6ab59016c92fcebbe80710a3e0adba570f73f7a931d16", + level=0, + when="@1.50", + ) def configure_args(self): args = [ |