[arch-commits] Commit in open-iscsi/trunk (0001-libkmod.patch)
Christian Hesse
eworm at archlinux.org
Thu Sep 12 21:03:08 UTC 2019
Date: Thursday, September 12, 2019 @ 21:03:07
Author: eworm
Revision: 509847
clean up
Deleted:
open-iscsi/trunk/0001-libkmod.patch
--------------------+
0001-libkmod.patch | 35 -----------------------------------
1 file changed, 35 deletions(-)
Deleted: 0001-libkmod.patch
===================================================================
--- 0001-libkmod.patch 2019-09-12 20:55:59 UTC (rev 509846)
+++ 0001-libkmod.patch 2019-09-12 21:03:07 UTC (rev 509847)
@@ -1,35 +0,0 @@
-diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile
-index bf7c96c..589c69b 100644
---- a/libopeniscsiusr/Makefile
-+++ b/libopeniscsiusr/Makefile
-@@ -44,7 +44,7 @@ OBJS = context.o misc.o session.o sysfs.o iface.o idbm.o node.o default.o
- CFLAGS ?= -O2 -g
- CFLAGS += -Wall -Werror -Wextra -fvisibility=hidden -fPIC
-
--LIBADD =
-+LIBADD = -lkmod
-
- all: $(LIBS) $(LIBS_MAJOR) $(TESTS) doc
-
-diff --git a/usr/Makefile b/usr/Makefile
-index f9445ad..13a719d 100644
---- a/usr/Makefile
-+++ b/usr/Makefile
-@@ -36,7 +36,7 @@ CFLAGS ?= -O2 -g
- WARNFLAGS ?= -Wall -Wstrict-prototypes
- CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \
- -I$(TOPDIR)/libopeniscsiusr
--ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr
-+ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr -lkmod
- PROGRAMS = iscsid iscsiadm iscsistart
-
- # libc compat files
-@@ -60,7 +60,7 @@ all: $(PROGRAMS)
-
- iscsid: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \
- iscsid.o session_mgmt.o discoveryd.o mntcheck.o
-- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lrt -lmount $(ISCSI_LIB)
-+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lrt -lmount -lsystemd $(ISCSI_LIB)
-
- iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o mntcheck.o
- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lmount $(ISCSI_LIB)
More information about the arch-commits
mailing list