54e364
From b0d26441cebf6f1d78a2b4523ee9c348578b3d91 Mon Sep 17 00:00:00 2001
e8d211
From: rpm-build <rpm-build>
e8d211
Date: Thu, 24 May 2018 15:17:05 -0700
54e364
Subject: [PATCH 23/32] libiscsi fix build to use libopeniscsiusr
e8d211
e8d211
---
e8d211
 libiscsi/Makefile | 6 ++++--
e8d211
 1 file changed, 4 insertions(+), 2 deletions(-)
e8d211
e8d211
diff --git a/libiscsi/Makefile b/libiscsi/Makefile
e8d211
index 317a7ec4db30..1196bb5c0cf4 100644
e8d211
--- a/libiscsi/Makefile
e8d211
+++ b/libiscsi/Makefile
e8d211
@@ -4,7 +4,9 @@ OSNAME=$(shell uname -s)
e8d211
 OPTFLAGS ?= -O2 -g
e8d211
 WARNFLAGS ?= -Wall -Wstrict-prototypes
e8d211
 CFLAGS = $(OPTFLAGS) $(WARNFLAGS) -I../include -I../usr \
e8d211
-		-D$(OSNAME) -fPIC -D_GNU_SOURCE -fvisibility=hidden
e8d211
+		-D$(OSNAME) -fPIC -D_GNU_SOURCE -fvisibility=hidden \
e8d211
+		-I../libopeniscsiusr
e8d211
+LDFLAGS = -L../libopeniscsiusr -lopeniscsiusr
e8d211
 LIB = libiscsi.so.0
e8d211
 TESTS = tests/test_discovery_sendtargets tests/test_discovery_firmware
e8d211
 TESTS += tests/test_login tests/test_logout tests/test_params
e8d211
@@ -19,7 +21,7 @@ FW_PARAM_SRCS = fw_entry.o prom_lex.o prom_parse.tab.o fwparam_ppc.o fwparam_sys
e8d211
 # sources shared with the userspace utils, note we build these separately
e8d211
 # to get PIC versions.
e8d211
 COMMON_OBJS = $(patsubst %.o, common-objs/%.o, $(COMMON_SRCS))
e8d211
-USR_OBJS = $(patsubst %.o, usr-objs/%.o, $(ISCSI_LIB_SRCS) strings.o)
e8d211
+USR_OBJS = $(patsubst %.o, usr-objs/%.o, $(ISCSI_LIB_SRCS) local_strings.o)
e8d211
 FW_OBJS = $(patsubst %.o, fw-objs/%.o, $(FW_PARAM_SRCS))
e8d211
 
e8d211
 # Flags for the tests
e8d211
-- 
54e364
2.14.4
e8d211