diff options
| author | Bernhard Kaindl <contact@bernhard.kaindl.dev> | 2024-10-29 17:22:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-29 10:22:10 -0700 |
| commit | ffc904aa6b0a75c7a4b47b7af1af52f4b0488973 (patch) | |
| tree | aa316e89428c81ef76509a8e187cd4db881e91f6 | |
| parent | f889b2a95ef126723bf6003fd8d5ed2a0e86f625 (diff) | |
| download | spack-ffc904aa6b0a75c7a4b47b7af1af52f4b0488973.tar.gz spack-ffc904aa6b0a75c7a4b47b7af1af52f4b0488973.tar.bz2 spack-ffc904aa6b0a75c7a4b47b7af1af52f4b0488973.tar.xz spack-ffc904aa6b0a75c7a4b47b7af1af52f4b0488973.zip | |
r-textshaping,r-ragg: Add dep on pkgconfig, type="build" and handle freetype@2.13.3 (#47091)
* r-textshaping: build-dep on pkgconfig to find harfbuzz
* r-ragg: Fix build with freetype@2.13.3
| -rw-r--r-- | var/spack/repos/builtin/packages/r-ragg/package.py | 6 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/r-textshaping/package.py | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/r-ragg/package.py b/var/spack/repos/builtin/packages/r-ragg/package.py index 0d0abcb60c..399b5209f7 100644 --- a/var/spack/repos/builtin/packages/r-ragg/package.py +++ b/var/spack/repos/builtin/packages/r-ragg/package.py @@ -28,3 +28,9 @@ class RRagg(RPackage): depends_on("libpng") depends_on("libtiff") depends_on("jpeg") + + def flag_handler(self, name, flags): + # Freetype 2.13.3 broke the public interface by switching char/unsigned char: + if name == "cxxflags" and self.spec["freetype"].version >= Version("2.13.3"): + flags.append("-fpermissive") + return (flags, None, None) diff --git a/var/spack/repos/builtin/packages/r-textshaping/package.py b/var/spack/repos/builtin/packages/r-textshaping/package.py index 877fe54114..2de9d3270c 100644 --- a/var/spack/repos/builtin/packages/r-textshaping/package.py +++ b/var/spack/repos/builtin/packages/r-textshaping/package.py @@ -23,6 +23,7 @@ class RTextshaping(RPackage): depends_on("r@3.2.0:", type=("build", "run")) depends_on("r-systemfonts@1.0.0:", type=("build", "run")) depends_on("r-cpp11@0.2.1:", type=("build", "run")) + depends_on("pkgconfig", type="build") depends_on("freetype") depends_on("harfbuzz") depends_on("fribidi") |