Skip to content

Commit 59a3bd8

Browse files
committed
"git am" committer
1 parent ac29414 commit 59a3bd8

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

library_builders.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,17 @@ function build_adios2 {
9090
# patch -p1 ../0001-Pull-in-atl-dill-EVPath-ffs-after-merging-https-gith.patch
9191
# cd ..
9292

93-
# temporary, need to try sth
93+
# temporary for macOS on ADIOS 2.11.0
9494
git clone https://github.com/ornladios/ADIOS2 ADIOS2-2.11.0
9595
cd ADIOS2-2.11.0
9696
git checkout 7a21e4ef2f5def6659e67084b5210a66582d4b1a
97-
curl -sLo 4820.patch https://github.com/ornladios/ADIOS2/pull/4820.patch
98-
git am 4820.patch
99-
git diff
97+
if [ "$(uname -s)" = "Darwin" ]
98+
then
99+
curl -sLo 4820.patch https://github.com/ornladios/ADIOS2/pull/4820.patch
100+
GIT_COMMITTER_NAME="Greg Eisenhauer" GIT_COMMITTER_EMAIL="eisen@cc.gatech.edu" \
101+
git am 4820.patch
102+
git diff
103+
fi
100104
cd ..
101105

102106
# build

0 commit comments

Comments
 (0)