Skip to content

Commit 1aa168e

Browse files
committed
Add in libaio-aarch64 and update fio-aarch64 to support libaio on arm
1 parent d854113 commit 1aa168e

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

tools/Makefile

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,16 @@ ifeq ("$(wildcard ethtool-aarch64/Makefile)","")
151151
endif
152152
cd ethtool-aarch64 && make -j$(NPROC)
153153

154+
LIBAIO_VERSION := libaio-0.3.113
155+
libaio-aarch64:
156+
ifeq ("$(wildcard libaio-aarch64)","")
157+
git clone https://pagure.io/libaio libaio-aarch64
158+
else
159+
cd libaio-aarch64 && git checkout master && git pull
160+
endif
161+
cd libaio-aarch64 && git checkout $(LIBAIO_VERSION)
162+
cd libaio-aarch64 && CC=aarch64-linux-gnu-gcc make -j$(NPROC)
163+
154164
FIO_VERSION := "fio-3.38"
155165
fio:
156166
ifeq ("$(wildcard fio)","")
@@ -164,15 +174,16 @@ ifeq ("$(wildcard fio/config.log)","")
164174
endif
165175
cd fio && make -j$(NPROC)
166176

167-
fio-aarch64:
177+
# fio-aarch64 needs de3d5e68dd017a6d6099913b7831bb94f46e49cc or newer to support "--extra-ldflags" from commit 6fbe3284d
178+
fio-aarch64: libaio-aarch64
168179
ifeq ("$(wildcard fio-aarch64)","")
169180
git clone https://github.com/axboe/fio.git fio-aarch64
170181
else
171182
cd fio-aarch64 && git checkout master && git pull
172183
endif
173-
cd fio-aarch64 && git checkout $(FIO_VERSION)
184+
cd fio-aarch64 && git checkout de3d5e68dd017a6d6099913b7831bb94f46e49cc
174185
ifeq ("$(wildcard fio-aarch64/config.log)","")
175-
cd fio-aarch64 && ./configure --build-static --disable-native --cc=aarch64-linux-gnu-gcc
186+
cd fio-aarch64 && ./configure --build-static --disable-native --cc=aarch64-linux-gnu-gcc --extra-cflags="-I../libaio-aarch64/src" --extra-ldflags="-L../libaio-aarch64/src"
176187
endif
177188
cd fio-aarch64 && make -j$(NPROC)
178189

0 commit comments

Comments
 (0)