Skip to content

Commit dcc123f

Browse files
committed
[Patch] ADIOS macOS DILL
Trying ornladios/ADIOS2#4820
1 parent 98a79e6 commit dcc123f

3 files changed

Lines changed: 43 additions & 31 deletions

File tree

0001-Try-another-fix.patch

Lines changed: 0 additions & 29 deletions
This file was deleted.

ADIOS2_4820.patch

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
From c7961dd9e12d72b279db75fd184d2b3b4f151560 Mon Sep 17 00:00:00 2001
2+
From: Greg Eisenhauer <eisen@cc.gatech.edu>
3+
Date: Mon, 26 Jan 2026 15:55:08 -0500
4+
Subject: [PATCH] Fix MacOS Static build without FFI
5+
6+
---
7+
thirdparty/EVPath/EVPath/EVPathConfigCommon.cmake.in | 4 +++-
8+
thirdparty/ffs/CMakeLists.txt | 6 +++++-
9+
2 files changed, 8 insertions(+), 2 deletions(-)
10+
11+
diff --git a/thirdparty/EVPath/EVPath/EVPathConfigCommon.cmake.in b/thirdparty/EVPath/EVPath/EVPathConfigCommon.cmake.in
12+
index 16afb7ef7d..9b35728090 100644
13+
--- a/thirdparty/EVPath/EVPath/EVPathConfigCommon.cmake.in
14+
+++ b/thirdparty/EVPath/EVPath/EVPathConfigCommon.cmake.in
15+
@@ -4,7 +4,9 @@ find_dependency(atl @atl_VERSION@)
16+
find_dependency(ffs @ffs_VERSION@)
17+
18+
if(NOT @BUILD_SHARED_LIBS@)
19+
- find_dependency(dill @dill_VERSION@)
20+
+ if(@HAVE_COD_H@)
21+
+ find_dependency(dill @dill_VERSION@)
22+
+ endif()
23+
24+
if(@NVML_FOUND@)
25+
find_dependency(NVML)
26+
diff --git a/thirdparty/ffs/CMakeLists.txt b/thirdparty/ffs/CMakeLists.txt
27+
index e47512f581..ebead5095d 100644
28+
--- a/thirdparty/ffs/CMakeLists.txt
29+
+++ b/thirdparty/ffs/CMakeLists.txt
30+
@@ -4,7 +4,11 @@ set(BUILD_TESTING OFF)
31+
set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_CMAKEDIR}/thirdparty")
32+
33+
set(FFS_USE_ATL ON CACHE INTERNAL "")
34+
-set(FFS_USE_DILL ON CACHE INTERNAL "")
35+
+if(TARGET dill::dill)
36+
+ set(FFS_USE_DILL ON CACHE INTERNAL "")
37+
+else()
38+
+ set(FFS_USE_DILL OFF CACHE INTERNAL "")
39+
+endif()
40+
set(FFS_LIBRARIES_ONLY ON CACHE INTERNAL "")
41+
set(FFS_QUIET ON CACHE INTERNAL "")
42+
set(FFS_LIBRARY_PREFIX adios2${ADIOS2_LIBRARY_SUFFIX}_ CACHE INTERNAL "")

library_builders.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ function build_adios2 {
9494
git clone https://github.com/ornladios/ADIOS2 ADIOS2-2.11.0
9595
cd ADIOS2-2.11.0
9696
git checkout 7a21e4ef2f5def6659e67084b5210a66582d4b1a
97-
patch -p1 ../0001-Try-another-fix.patch
97+
patch -p1 ../ADIOS2_4820.patch
9898
git diff
9999
cd ..
100100

@@ -125,7 +125,6 @@ function build_adios2 {
125125
-DCMAKE_VERBOSE_MAKEFILE=ON \
126126
-DCMAKE_DISABLE_FIND_PACKAGE_LibFFI=TRUE \
127127
-DCMAKE_DISABLE_FIND_PACKAGE_BISON=TRUE \
128-
-DFFS_USE_DILL=FALSE \
129128
-DADIOS2_INSTALL_GENERATE_CONFIG=OFF \
130129
-DCMAKE_INSTALL_PREFIX=${BUILD_PREFIX} ../ADIOS2-*
131130

0 commit comments

Comments
 (0)