[PATCH 0/2] fio: a couple build fixes

[PATCH 0/2] fio: a couple build fixes

[Eric Sandeen]

Maybe it's just me, but t/io_uring.c doesn't link for me without -laio when CONFIG_LIBAIO
is set.

I also got a report that dynamic engines aren't properly picking up LDFLAGS set by the
build system (in this case, -Wl,-z,now).

So these two patches try to resolve those issues.

[PATCH 1/2] t/io_uring: link with libaio when necessary

[Eric Sandeen]

When CONFIG_LIBAIO is enabled, we need t/io_uring to link with it.
(libaio_LIBS only affects the aio engine, AFAICT.)

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---

diff --git a/Makefile b/Makefile
index 5d17bca..00e7953 100644
--- a/Makefile
+++ b/Makefile
@@ -99,6 +99,7 @@ endif
  ifdef CONFIG_LIBAIO
    libaio_SRCS = engines/libaio.c
    cmdprio_SRCS = engines/cmdprio.c
+  LIBS += -laio
    libaio_LIBS = -laio
    ENGINES += libaio
  endif

[PATCH 2/2] fio: use LDFLAGS when linking dynamic engines

[Eric Sandeen]

Without this, locally defined LDFLAGS won't be applied when
linking the dynamically loaded IO engines.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---

diff --git a/Makefile b/Makefile
index 5d17bca..00e7953 100644
@@ -294,7 +295,7 @@ define engine_template =
  $(1)_OBJS := $$($(1)_SRCS:.c=.o)
  $$($(1)_OBJS): CFLAGS := -fPIC $$($(1)_CFLAGS) $(CFLAGS)
  engines/fio-$(1).so: $$($(1)_OBJS)
-	$$(QUIET_LINK)$(CC) -shared -rdynamic -fPIC -Wl,-soname,fio-$(1).so.1 -o $$@ $$< $$($(1)_LIBS)
+	$$(QUIET_LINK)$(CC) $(LDFLAGS) -shared -rdynamic -fPIC -Wl,-soname,fio-$(1).so.1 -o $$@ $$< $$($(1)_LIBS)
  ENGS_OBJS += engines/fio-$(1).so
  endef
  else # !CONFIG_DYNAMIC_ENGINES

[PATCH 2/2 V2] fio: use LDFLAGS when linking dynamic engines

[Eric Sandeen]

Without this, locally defined LDFLAGS won't be applied when
linking the dynamically loaded IO engines.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---

V2: Seems like V1 inexplicably got whitespace damaged, sorry,
let's try again :/

diff --git a/Makefile b/Makefile
index 5d17bca..00e7953 100644
@@ -294,7 +295,7 @@ define engine_template =
  $(1)_OBJS := $$($(1)_SRCS:.c=.o)
  $$($(1)_OBJS): CFLAGS := -fPIC $$($(1)_CFLAGS) $(CFLAGS)
  engines/fio-$(1).so: $$($(1)_OBJS)
-	$$(QUIET_LINK)$(CC) -shared -rdynamic -fPIC -Wl,-soname,fio-$(1).so.1 -o $$@ $$< $$($(1)_LIBS)
+	$$(QUIET_LINK)$(CC) $(DYNAMIC) -shared -rdynamic -fPIC -Wl,-soname,fio-$(1).so.1 -o $$@ $$< $$($(1)_LIBS)
  ENGS_OBJS += engines/fio-$(1).so
  endef
  else # !CONFIG_DYNAMIC_ENGINES

Re: [PATCH 0/2] fio: a couple build fixes

[Jens Axboe]

On 1/25/22 11:55 AM, Eric Sandeen wrote:
> Maybe it's just me, but t/io_uring.c doesn't link for me without -laio when CONFIG_LIBAIO
> is set.
> 
> I also got a report that dynamic engines aren't properly picking up LDFLAGS set by the
> build system (in this case, -Wl,-z,now).
> 
> So these two patches try to resolve those issues.

Applied, thanks Eric. On the patches, looks like format=flowed is set, which
may explain why it ends up being borken.

-- 
Jens Axboe