1 From a86a677762cf5fd45a43029a4fd3dd83d1a87a98 Mon Sep 17 00:00:00 2001
2 From: rpm-build <rpm-build>
3 Date: Thu, 24 May 2018 15:17:05 -0700
4 Subject: [PATCH] libiscsi fix build to use libopeniscsiusr
7 libiscsi/Makefile | 6 ++++--
8 1 file changed, 4 insertions(+), 2 deletions(-)
10 diff --git a/libiscsi/Makefile b/libiscsi/Makefile
11 index 53f9746..f2cf248 100644
12 --- a/libiscsi/Makefile
13 +++ b/libiscsi/Makefile
14 @@ -8,7 +8,9 @@ OSNAME=$(shell uname -s)
16 WARNFLAGS ?= -Wall -Wstrict-prototypes
17 CFLAGS = $(OPTFLAGS) $(WARNFLAGS) -I../include -I../usr \
18 - -D$(OSNAME) -fPIC -D_GNU_SOURCE -fvisibility=hidden
19 + -D$(OSNAME) -fPIC -D_GNU_SOURCE -fvisibility=hidden \
20 + -I../libopeniscsiusr
21 +LDFLAGS = -L../libopeniscsiusr -lopeniscsiusr
23 TESTS = tests/test_discovery_sendtargets tests/test_discovery_firmware
24 TESTS += tests/test_login tests/test_logout tests/test_params
25 @@ -23,7 +25,7 @@ FW_PARAM_SRCS = fw_entry.o prom_lex.o prom_parse.tab.o fwparam_ppc.o fwparam_sys
26 # sources shared with the userspace utils, note we build these separately
27 # to get PIC versions.
28 COMMON_OBJS = $(patsubst %.o, common-objs/%.o, $(COMMON_SRCS))
29 -USR_OBJS = $(patsubst %.o, usr-objs/%.o, $(ISCSI_LIB_SRCS) strings.o)
30 +USR_OBJS = $(patsubst %.o, usr-objs/%.o, $(ISCSI_LIB_SRCS) local_strings.o)
31 FW_OBJS = $(patsubst %.o, fw-objs/%.o, $(FW_PARAM_SRCS))