diff mbox series

[v1,2/2] package/fio: add optional libiscsi dependency

Message ID 20230516082340.1375834-2-bigunclemax@gmail.com
State Accepted
Headers show
Series [v1,1/2] package/fio: bump to version 3.34 | expand

Commit Message

Maxim Kiselev May 16, 2023, 8:23 a.m. UTC
Since commit 247ef2a fio has optional libiscsi engine support

This patch enables fio iscsi support if BR2_PACKAGE_LIBISCSI
was selected

Signed-off-by: Maksim Kiselev <bigunclemax@gmail.com>
---
 package/fio/fio.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Comments

Thomas Petazzoni July 29, 2023, 11:57 a.m. UTC | #1
On Tue, 16 May 2023 11:23:40 +0300
Maksim Kiselev <bigunclemax@gmail.com> wrote:

> Since commit 247ef2a fio has optional libiscsi engine support
> 
> This patch enables fio iscsi support if BR2_PACKAGE_LIBISCSI
> was selected

As pkg-config is used by the configure script to detect how to
compile/link against libiscsi, I've added host-pkgconf to the
dependencies when BR2_PACKAGE_LIBISCSI=y. I also updated a bit the
commit log to explain why we don't pass --disable-libiscsi.

Applied with those changes, thanks a lot!

Thomas
diff mbox series

Patch

diff --git a/package/fio/fio.mk b/package/fio/fio.mk
index 90ec407207..45092a0d80 100644
--- a/package/fio/fio.mk
+++ b/package/fio/fio.mk
@@ -9,6 +9,8 @@  FIO_SITE = http://brick.kernel.dk/snaps
 FIO_LICENSE = GPL-2.0
 FIO_LICENSE_FILES = COPYING MORAL-LICENSE
 
+FIO_OPTS = --cc="$(TARGET_CC)" --extra-cflags="$(TARGET_CFLAGS)"
+
 ifeq ($(BR2_PACKAGE_LIBAIO),y)
 FIO_DEPENDENCIES += libaio
 endif
@@ -17,6 +19,11 @@  ifeq ($(BR2_PACKAGE_LIBNFS),y)
 FIO_DEPENDENCIES += libnfs
 endif
 
+ifeq ($(BR2_PACKAGE_LIBISCSI),y)
+FIO_OPTS += --enable-libiscsi
+FIO_DEPENDENCIES += libiscsi
+endif
+
 ifeq ($(BR2_PACKAGE_NUMACTL),y)
 FIO_DEPENDENCIES += numactl
 endif
@@ -26,7 +33,7 @@  FIO_DEPENDENCIES += zlib
 endif
 
 define FIO_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) ./configure --cc="$(TARGET_CC)" --extra-cflags="$(TARGET_CFLAGS)")
+	(cd $(@D); $(TARGET_MAKE_ENV) ./configure $(FIO_OPTS))
 endef
 
 define FIO_BUILD_CMDS