Skip to content

Commit 0558741

Browse files
committed
resolve patch command on different systems
* copy the original file darshan-apmpi.c to orig_darshan-apmpi.c so it can be restored when running make clean * store the entire patched darshan-apmpi.c as patched_darshan-apmpi.c instead of patch file. This is because on some system, e.g. Perlmutter, patch command may apply patch files differently
1 parent aa5c7d7 commit 0558741

File tree

3 files changed

+4459
-9
lines changed

3 files changed

+4459
-9
lines changed

modules/Makefile.am

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,21 @@
44
# @configure_input@
55

66
apmpi_c_src = $(srcdir)/autoperf/apmpi/lib/darshan-apmpi.c
7-
apmpi_c_saved = $(srcdir)/autoperf/apmpi/lib/saved_darshan-apmpi.c
8-
apmpi_c_patch = $(srcdir)/apmpi.patch
7+
apmpi_c_patched = $(srcdir)/patched_darshan-apmpi.c
8+
apmpi_c_saved = $(srcdir)/saved_darshan-apmpi.c
9+
apmpi_c_orig = $(srcdir)/orig_darshan-apmpi.c
910

1011
# Rule to apply the patch
11-
$(apmpi_c_saved): $(apmpi_c_src) $(apmpi_c_patch)
12+
$(apmpi_c_saved): $(apmpi_c_src) $(apmpi_c_patched)
1213
cp -f $(apmpi_c_src) $(apmpi_c_saved)
13-
patch -f -p0 $(apmpi_c_src) < $(apmpi_c_patch)
14-
touch $@
14+
cp -f $(apmpi_c_patched) $(apmpi_c_src)
15+
touch $(apmpi_c_saved)
1516

1617
BUILT_SOURCES = $(apmpi_c_saved)
1718

18-
EXTRA_DIST = apmpi.patch
19+
EXTRA_DIST = patched_darshan-apmpi.c orig_darshan-apmpi.c
1920

20-
clean: $(apmpi_c_saved)
21-
cp -f $(apmpi_c_saved) $(apmpi_c_src)
22-
rm -f $(apmpi_c_saved) $(apmpi_c_src).*
21+
clean:
22+
rm -f $(apmpi_c_saved)
23+
cp -f $(apmpi_c_orig) $(apmpi_c_src)
2324

0 commit comments

Comments
 (0)