|
 |
5f4533 |
From aeca36572c02a8bf314037d82c4a2625636b175a Mon Sep 17 00:00:00 2001
|
|
|
5f4533 |
From: Chris Leech <cleech@redhat.com>
|
|
|
5f4533 |
Date: Mon, 3 Jun 2019 14:36:48 -0700
|
|
|
5f4533 |
Subject: [PATCH] fix iscsiuio build with libsystemd
|
|
|
5f4533 |
|
|
|
5f4533 |
---
|
|
|
5f4533 |
iscsiuio/configure.ac | 2 ++
|
|
|
5f4533 |
iscsiuio/src/unix/Makefile.am | 6 ++++--
|
|
|
5f4533 |
2 files changed, 6 insertions(+), 2 deletions(-)
|
|
|
5f4533 |
|
|
|
5f4533 |
diff --git a/iscsiuio/configure.ac b/iscsiuio/configure.ac
|
|
|
5f4533 |
index ae23078..6138e0e 100644
|
|
|
5f4533 |
--- a/iscsiuio/configure.ac
|
|
|
5f4533 |
+++ b/iscsiuio/configure.ac
|
|
|
5f4533 |
@@ -73,6 +73,8 @@ AC_CONFIG_COMMANDS([default],[[
|
|
|
5f4533 |
echo 'char *build_date;'> src/unix/build_date.h
|
|
|
5f4533 |
]],[[]])
|
|
|
5f4533 |
|
|
|
5f4533 |
+PKG_CHECK_MODULES([LIBSYSTEMD], [libsystemd])
|
|
|
5f4533 |
+
|
|
|
5f4533 |
AC_PREFIX_DEFAULT()
|
|
|
5f4533 |
|
|
|
5f4533 |
AC_OUTPUT([Makefile
|
|
|
5f4533 |
diff --git a/iscsiuio/src/unix/Makefile.am b/iscsiuio/src/unix/Makefile.am
|
|
|
5f4533 |
index a989ef0..ea5f59e 100644
|
|
|
5f4533 |
--- a/iscsiuio/src/unix/Makefile.am
|
|
|
5f4533 |
+++ b/iscsiuio/src/unix/Makefile.am
|
|
|
5f4533 |
@@ -25,7 +25,8 @@ iscsiuio_SOURCES = build_date.c \
|
|
|
5f4533 |
|
|
|
5f4533 |
iscsiuio_CFLAGS = $(AM_CFLAGS) \
|
|
|
5f4533 |
$(LIBNL_CFLAGS) \
|
|
|
5f4533 |
- -DBYTE_ORDER=@ENDIAN@
|
|
|
5f4533 |
+ -DBYTE_ORDER=@ENDIAN@ \
|
|
|
5f4533 |
+ $(LIBSYSTEMD_CFLAGS)
|
|
|
5f4533 |
|
|
|
5f4533 |
iscsiuio_LDFLAGS= $(AM_LDADD) \
|
|
|
5f4533 |
-ldl \
|
|
|
5f4533 |
@@ -36,6 +37,7 @@ iscsiuio_LDFLAGS= $(AM_LDADD) \
|
|
|
5f4533 |
iscsiuio_LDADD = ${top_srcdir}/src/uip/lib_iscsi_uip.a \
|
|
|
5f4533 |
${top_srcdir}/src/apps/dhcpc/lib_apps_dhcpc.a\
|
|
|
5f4533 |
${top_srcdir}/src/apps/brcm-iscsi/lib_apps_brcm_iscsi.a \
|
|
|
5f4533 |
- ${top_srcdir}/src/unix/libs/lib_iscsiuio_hw_cnic.a
|
|
|
5f4533 |
+ ${top_srcdir}/src/unix/libs/lib_iscsiuio_hw_cnic.a \
|
|
|
5f4533 |
+ $(LIBSYSTEMD_LIBS)
|
|
|
5f4533 |
|
|
|
5f4533 |
iscsiuio_YFLAGS = -d
|
|
|
5f4533 |
--
|
|
|
5f4533 |
2.21.0
|
|
|
5f4533 |
|