From 884a0a392d10a8e3ab4928505002c739829f8028 Mon Sep 17 00:00:00 2001 From: Hector Martinez-Seara Date: Tue, 25 Jun 2024 22:06:38 +0200 Subject: [PATCH] rdma-core: Patched CMakeLists.txt to find drm include at libdrm - archlinux (#44839) * Patched CMakeLists.txt to find drm include at libdrm - archlinux * Restricted usage patch to versions 34 onwards * Update var/spack/repos/builtin/packages/rdma-core/libdrm.patch --------- Co-authored-by: Mark Abraham --- .../repos/builtin/packages/rdma-core/libdrm.patch | 11 +++++++++++ var/spack/repos/builtin/packages/rdma-core/package.py | 3 +++ 2 files changed, 14 insertions(+) create mode 100644 var/spack/repos/builtin/packages/rdma-core/libdrm.patch diff --git a/var/spack/repos/builtin/packages/rdma-core/libdrm.patch b/var/spack/repos/builtin/packages/rdma-core/libdrm.patch new file mode 100644 index 00000000000..41048b39cb4 --- /dev/null +++ b/var/spack/repos/builtin/packages/rdma-core/libdrm.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt 2024-06-24 15:48:01.389773228 +0200 ++++ b/CMakeLists.txt 2024-06-25 09:51:13.637660505 +0200 +@@ -539,7 +539,7 @@ + # drm headers + + # Check if the headers have been installed by kernel-headers +-find_path(DRM_INCLUDE_DIRS "drm.h" PATH_SUFFIXES "drm") ++find_path(DRM_INCLUDE_DIRS "drm.h" PATH_SUFFIXES "drm" "libdrm") + + # Alternatively the headers could have been installed by libdrm + if (NOT DRM_INCLUDE_DIRS) diff --git a/var/spack/repos/builtin/packages/rdma-core/package.py b/var/spack/repos/builtin/packages/rdma-core/package.py index f272287fb0e..b9fd54d991f 100644 --- a/var/spack/repos/builtin/packages/rdma-core/package.py +++ b/var/spack/repos/builtin/packages/rdma-core/package.py @@ -18,6 +18,7 @@ class RdmaCore(CMakePackage): license("GPL-2.0-only OR BSD-2-Clause") + version("52.0", sha256="1f0ce5f2462c982b20d21156707076278807a7adf4d10e9142f3be4bec1b2b83") version("51.0", sha256="0a4a55b1351356c2750f26ec9010e8c7370402a13c95799cb8b447cf0134dd61") version("50.0", sha256="405b9dd551120da9d1b8944c5ad24ab1f478fb13caedf5bf0d47053a6d6e20cc") version("49.1", sha256="2e531d398073dd7ed28d95c94fa698e1a831952b508e9af93e36644dcd399936") @@ -69,6 +70,8 @@ class RdmaCore(CMakePackage): version("17.1", sha256="b47444b7c05d3906deb8771eec3e634984dd83f5e620d5e37d3a83f74f0cc1ba") version("13", sha256="e5230fd7cda610753ad1252b40a28b1e9cf836423a10d8c2525b081527760d97") + patch("libdrm.patch", when="@34:") + variant( "static", default=True,