zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libgpg-error, libassuan: fixes for darwin (#44946)

Browse Source
This commit is contained in:
Massimiliano Culpo 2024-06-28 18:27:12 +02:00 committed by GitHub
parent 670f92f42b
commit ddf8384bc6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/ci.yaml vendored
View File

@ -53,6 +53,13 @@ jobs:
- 'var/spack/repos/builtin/packages/clingo/**' - 'var/spack/repos/builtin/packages/clingo/**'
- 'var/spack/repos/builtin/packages/python/**' - 'var/spack/repos/builtin/packages/python/**'
- 'var/spack/repos/builtin/packages/re2c/**' - '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/**' - 'lib/spack/**'
- 'share/spack/**' - 'share/spack/**'
- '.github/workflows/bootstrap.yml' - '.github/workflows/bootstrap.yml'

3
var/spack/repos/builtin/packages/libassuan/package.py
View File

@ -15,6 +15,7 @@ class Libassuan(AutotoolsPackage):
license("LGPL-2.1-or-later") license("LGPL-2.1-or-later")
version("3.0.1", sha256="c8f0f42e6103dea4b1a6a483cb556654e97302c7465308f58363778f95f194b1")
version("3.0.0", sha256="0b160cbb898b852c6c04314b9a63e90ca87501305ad72a58a010f808665bbaf6") version("3.0.0", sha256="0b160cbb898b852c6c04314b9a63e90ca87501305ad72a58a010f808665bbaf6")
version("2.5.7", sha256="0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76") version("2.5.7", sha256="0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76")
version("2.5.6", sha256="e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426") version("2.5.6", sha256="e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426")
@ -26,6 +27,8 @@ class Libassuan(AutotoolsPackage):
depends_on("libgpg-error@1.17:") depends_on("libgpg-error@1.17:")
conflicts("platform=darwin", when="@3")
def configure_args(self): def configure_args(self):
return [ return [
"--enable-static", "--enable-static",

7
var/spack/repos/builtin/packages/libgpg-error/package.py
View File

@ -36,6 +36,13 @@ class LibgpgError(AutotoolsPackage):
depends_on("awk", type="build") depends_on("awk", type="build")
# Patch for using gawk@5, c.f. https://dev.gnupg.org/T4459 # Patch for using gawk@5, c.f. https://dev.gnupg.org/T4459
patch("awk-5.patch", when="@1.36^gawk@5:") 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): def configure_args(self):
args = [ args = [