diff options
| author | Bernhard Kaindl <43588962+bernhardkaindl@users.noreply.github.com> | 2021-10-27 16:20:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-27 16:20:57 +0200 |
| commit | d1803af9579193afb66e0271d00c8c8edfbc33b8 (patch) | |
| tree | bd8cf00202e12348af2ce13de25d23c53eca75d0 | |
| parent | f4431851ab17ce08d6a31f355aa44718646e5da3 (diff) | |
| download | spack-d1803af9579193afb66e0271d00c8c8edfbc33b8.tar.gz spack-d1803af9579193afb66e0271d00c8c8edfbc33b8.tar.bz2 spack-d1803af9579193afb66e0271d00c8c8edfbc33b8.tar.xz spack-d1803af9579193afb66e0271d00c8c8edfbc33b8.zip | |
fontconfig: add v2.13.94 and fix test with dash (#26961)
Fix install --test=root with /bin/sh -> dash: A test uses
SIGINT SIGTERM SIGABRT EXIT for trap -> use signal numbers
| -rw-r--r-- | var/spack/repos/builtin/packages/fontconfig/package.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/fontconfig/package.py b/var/spack/repos/builtin/packages/fontconfig/package.py index c7b8806725..cd9990cdd1 100644 --- a/var/spack/repos/builtin/packages/fontconfig/package.py +++ b/var/spack/repos/builtin/packages/fontconfig/package.py @@ -11,6 +11,7 @@ class Fontconfig(AutotoolsPackage): homepage = "https://www.freedesktop.org/wiki/Software/fontconfig/" url = "https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.12.3.tar.gz" + version('2.13.94', sha256='246d1640a7e54fba697b28e4445f4d9eb63dda1b511d19986249368ee7191882') version('2.13.93', sha256='0f302a18ee52dde0793fe38b266bf269dfe6e0c0ae140e30d72c6cca5dc08db5') version('2.13.1', sha256='9f0d852b39d75fc655f9f53850eb32555394f36104a044bb2b2fc9e66dbbfa7f') version('2.12.3', sha256='ffc3cbf6dd9fcd516ee42f48306a715e66698b238933d6fa7cef02ea8b3b818e') @@ -25,6 +26,10 @@ class Fontconfig(AutotoolsPackage): depends_on('uuid', when='@2.13.1:') depends_on('python@3:', type='build', when='@2.13.93:') + def patch(self): + """Make test/run-test.sh compatible with dash""" + filter_file('SIGINT SIGTERM SIGABRT EXIT', '2 15 6 0', 'test/run-test.sh') + # Resolve known issue with tarballs 2.12.3 - 2.13.0 plus # https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/10 @run_before('configure') |