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