From 4dcb6a60aa5b17e34b7f39f8f7cbdcefbc531981 Mon Sep 17 00:00:00 2001
From: Ramon Nou <ramon.nou@bsc.es>
Date: Fri, 13 Jun 2025 10:56:31 +0200
Subject: [PATCH 1/2] wip1

---
 scripts/spack/packages/gekkofs/package.py |  2 +-
 src/client/CMakeLists.txt                 | 22 ++++++++++------------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/scripts/spack/packages/gekkofs/package.py b/scripts/spack/packages/gekkofs/package.py
index 9544dbe77..db842d1d7 100755
--- a/scripts/spack/packages/gekkofs/package.py
+++ b/scripts/spack/packages/gekkofs/package.py
@@ -24,7 +24,7 @@ class Gekkofs(CMakePackage):
 
     maintainers = ['marc_vef', 'ramon_nou']
     # set various versions
-    version('latest', branch='master', submodules=True)
+    version('latest', branch='rnou/spack', submodules=True)
     version('0.9.0', sha256='f6f7ec9735417d71d68553b6a4832e2c23f3e406d8d14ffb293855b8aeec4c3a', deprecated=True)
     version('0.9.1', sha256='1772b8a9d4777eca895f88cea6a1b4db2fda62e382ec9f73508e38e9d205d5f7', deprecated=True)
     version('0.9.2', sha256='30e0fb225e890b89eaddd930a10845d549c8f5be7aa4670e2cb97d4aaa3eb459', deprecated=True)
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 2ebed1fd1..27e2cc59c 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -32,18 +32,18 @@
 # based on syscall interception.
 # ##############################################################################
 
-add_library(MySyscallHeaders INTERFACE)
-add_library(MyArgobotsHeaders INTERFACE)
+# add_library(MySyscallHeaders INTERFACE)
+# add_library(MyArgobotsHeaders INTERFACE)
 
-target_link_libraries(MySyscallHeaders
-    INTERFACE
-        Syscall_intercept::Syscall_intercept
-)
+# target_link_libraries(MySyscallHeaders
+#     INTERFACE
+#         Syscall_intercept::Syscall_intercept
+# )
 
-target_link_libraries(MyArgobotsHeaders
-    INTERFACE
-        Argobots::Argobots
-)
+# target_link_libraries(MyArgobotsHeaders
+#     INTERFACE
+#         Argobots::Argobots
+# )
 
 
 add_library(gkfs_common SHARED)
@@ -74,8 +74,6 @@ target_link_libraries(
     fmt::fmt
     Threads::Threads
     Microsoft.GSL::GSL
-    MySyscallHeaders
-    MyArgobotsHeaders
 )
 
 add_library(gkfs_intercept SHARED)
-- 
GitLab


From 9eb94e1982f443d35e084c30c83b38899d8a62c5 Mon Sep 17 00:00:00 2001
From: Ramon Nou <ramon.nou@bsc.es>
Date: Fri, 13 Jun 2025 12:14:34 +0200
Subject: [PATCH 2/2] fix spack

---
 scripts/spack/packages/gekkofs/package.py | 12 +-----------
 src/client/CMakeLists.txt                 | 13 -------------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/scripts/spack/packages/gekkofs/package.py b/scripts/spack/packages/gekkofs/package.py
index db842d1d7..fc16fd3d1 100755
--- a/scripts/spack/packages/gekkofs/package.py
+++ b/scripts/spack/packages/gekkofs/package.py
@@ -24,7 +24,7 @@ class Gekkofs(CMakePackage):
 
     maintainers = ['marc_vef', 'ramon_nou']
     # set various versions
-    version('latest', branch='rnou/spack', submodules=True)
+    version('latest', branch='master', submodules=True)
     version('0.9.0', sha256='f6f7ec9735417d71d68553b6a4832e2c23f3e406d8d14ffb293855b8aeec4c3a', deprecated=True)
     version('0.9.1', sha256='1772b8a9d4777eca895f88cea6a1b4db2fda62e382ec9f73508e38e9d205d5f7', deprecated=True)
     version('0.9.2', sha256='30e0fb225e890b89eaddd930a10845d549c8f5be7aa4670e2cb97d4aaa3eb459', deprecated=True)
@@ -109,16 +109,6 @@ class Gekkofs(CMakePackage):
         ]
         return args
     
-    def patch(self):
-        # For gekkofs, add the missing Argobots::Argobots.
-        if self.spec.version == Version("0.9.4"):
-            filter_file(
-                r"PUBLIC dl",
-                "PUBLIC dl Argobots::Argobots",
-                "src/client/CMakeLists.txt"
-            )
-           
-
     def check(self):
         """Run tests"""
         with working_dir(self.build_directory):
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 27e2cc59c..a7d0247f5 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -32,19 +32,6 @@
 # based on syscall interception.
 # ##############################################################################
 
-# add_library(MySyscallHeaders INTERFACE)
-# add_library(MyArgobotsHeaders INTERFACE)
-
-# target_link_libraries(MySyscallHeaders
-#     INTERFACE
-#         Syscall_intercept::Syscall_intercept
-# )
-
-# target_link_libraries(MyArgobotsHeaders
-#     INTERFACE
-#         Argobots::Argobots
-# )
-
 
 add_library(gkfs_common SHARED)
 target_sources(gkfs_common
-- 
GitLab