rpms/iscsi-initiator-utils
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Link libiscsi against libopeniscsiusr (bz #1594946)

Browse Source
This commit is contained in:
Adam Williamson 2018-06-25 14:00:28 -07:00
parent 5aefa61999
commit 2609792d9b
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
0009-libiscsi.patch
View File

@ -69,9 +69,13 @@ new file mode 100644
index 000000000000..317a7ec4db30 index 000000000000..317a7ec4db30
--- /dev/null --- /dev/null
+++ b/libiscsi/Makefile +++ b/libiscsi/Makefile
@@ -0,0 +1,61 @@ @@ -0,0 +1,65 @@
+# This Makefile will work only with GNU make. +# This Makefile will work only with GNU make.
+ +
+ifeq ($(TOPDIR),)
+ TOPDIR = ..
+endif
+
+OSNAME=$(shell uname -s) +OSNAME=$(shell uname -s)
+OPTFLAGS ?= -O2 -g +OPTFLAGS ?= -O2 -g
+WARNFLAGS ?= -Wall -Wstrict-prototypes +WARNFLAGS ?= -Wall -Wstrict-prototypes
@ -115,7 +119,7 @@ index 000000000000..317a7ec4db30
+ $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) -c $< -o $@
+ +
+$(LIB): $(COMMON_OBJS) $(FW_OBJS) $(USR_OBJS) libiscsi.o +$(LIB): $(COMMON_OBJS) $(FW_OBJS) $(USR_OBJS) libiscsi.o
+ $(CC) $(CFLAGS) -shared -Wl,-soname,$(LIB) $^ -o $@ + $(CC) $(CFLAGS) -shared -Wl,-soname,$(LIB) $^ -o $@ -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr
+ ln -s -f $(LIB) libiscsi.so + ln -s -f $(LIB) libiscsi.so
+ +
+$(TESTS): $(FW_OBJS) $(COMMON_OBJS) $(USR_OBJS) $(LIB) +$(TESTS): $(FW_OBJS) $(COMMON_OBJS) $(USR_OBJS) $(LIB)

5
iscsi-initiator-utils.spec
View File

@ -13,7 +13,7 @@
Summary: iSCSI daemon and utility programs Summary: iSCSI daemon and utility programs
Name: iscsi-initiator-utils Name: iscsi-initiator-utils
Version: 6.%{open_iscsi_version}.%{open_iscsi_build} Version: 6.%{open_iscsi_version}.%{open_iscsi_build}
Release: 2.git%{shortcommit0}%{?dist} Release: 3.git%{shortcommit0}%{?dist}
Group: System Environment/Daemons Group: System Environment/Daemons
License: GPLv2+ License: GPLv2+
URL: http://www.open-iscsi.org URL: http://www.open-iscsi.org
@ -346,6 +346,9 @@ fi
%{python3_sitearch}/* %{python3_sitearch}/*
%changelog %changelog
* Mon Jun 25 2018 Adam Williamson <awilliam@redhat.com> - 6.2.0.876-3.git4ef9261
- Link libiscsi against libopeniscsiusr (bz #1594946) (python 3.6 build)
* Wed Jun 20 2018 Miro Hrončok <mhroncok@redhat.com> - 6.2.0.876-2.git4ef9261 * Wed Jun 20 2018 Miro Hrončok <mhroncok@redhat.com> - 6.2.0.876-2.git4ef9261
- Rebuilt for Python 3.7 - Rebuilt for Python 3.7