Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/, sys-block/open-iscsi/files/
Date: Sun, 03 May 2020 20:36:00
Message-Id: 1588538149.2b34abb755bf4dd2500e6a59d09a58ddee12842f.whissi@gentoo
1 commit: 2b34abb755bf4dd2500e6a59d09a58ddee12842f
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 3 20:35:36 2020 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Sun May 3 20:35:49 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b34abb7
7
8 sys-block/open-iscsi: drop -Werror
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.22
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 .../files/open-iscsi-2.1.1-Makefiles.patch | 78 ++++++++++++++++++++++
14 sys-block/open-iscsi/open-iscsi-2.1.1.ebuild | 2 +-
15 2 files changed, 79 insertions(+), 1 deletion(-)
16
17 diff --git a/sys-block/open-iscsi/files/open-iscsi-2.1.1-Makefiles.patch b/sys-block/open-iscsi/files/open-iscsi-2.1.1-Makefiles.patch
18 new file mode 100644
19 index 00000000000..02e651e27c2
20 --- /dev/null
21 +++ b/sys-block/open-iscsi/files/open-iscsi-2.1.1-Makefiles.patch
22 @@ -0,0 +1,78 @@
23 +--- a/libopeniscsiusr/Makefile
24 ++++ b/libopeniscsiusr/Makefile
25 +@@ -44,7 +44,7 @@ EXTRA_MAN_FILES = libopeniscsiusr.h.3
26 + OBJS = context.o misc.o session.o sysfs.o iface.o idbm.o node.o default.o
27 +
28 + CFLAGS ?= -O2 -g
29 +-CFLAGS += -Wall -Werror -Wextra -fvisibility=hidden -fPIC
30 ++CFLAGS += -Wall -Wextra -fvisibility=hidden -fPIC
31 + CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod)
32 +
33 + LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod)
34 +--- a/usr/Makefile
35 ++++ b/usr/Makefile
36 +@@ -35,7 +35,7 @@ endif
37 + PKG_CONFIG = /usr/bin/pkg-config
38 +
39 + CFLAGS ?= -O2 -g
40 +-WARNFLAGS ?= -Wall -Wextra -Werror -Wstrict-prototypes -fno-common
41 ++WARNFLAGS ?= -Wall -Wextra -Wstrict-prototypes -fno-common
42 + CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \
43 + -I$(TOPDIR)/libopeniscsiusr
44 + CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod)
45 +@@ -76,9 +76,9 @@ iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \
46 + iscsistart.o statics.o
47 + $(CC) $(CFLAGS) $^ -o $@ -lcrypto -lrt $(LDFLAGS) $(ISCSI_LIB)
48 + clean:
49 +- rm -f *.o $(PROGRAMS) .depend $(LIBSYS)
50 ++ $(RM) *.o $(PROGRAMS) .depend $(LIBSYS)
51 +
52 + depend:
53 +- gcc $(CFLAGS) -M `ls *.c` > .depend
54 ++ $(CC) $(CFLAGS) -M `ls *.c` > .depend
55 +
56 + -include .depend
57 +--- a/utils/Makefile
58 ++++ b/utils/Makefile
59 +@@ -10,9 +10,9 @@ iscsi-iname: md5.o iscsi-iname.o
60 + $(CC) $(CFLAGS) $(LDFLAGS) $^ $(DBM_LIB) -o $@
61 +
62 + clean:
63 +- rm -f *.o $(PROGRAMS) .depend
64 ++ $(RM) *.o $(PROGRAMS) .depend
65 +
66 + depend:
67 +- gcc $(CFLAGS) -M `ls *.c` > .depend
68 ++ $(CC) $(CFLAGS) -M `ls *.c` > .depend
69 +
70 + -include .depend
71 +--- a/utils/fwparam_ibft/Makefile
72 ++++ b/utils/fwparam_ibft/Makefile
73 +@@ -41,11 +41,11 @@ LDFLAGS += -L$(TOPDIR)/libopeniscsiusr -liscsiusr
74 + all: $(OBJS)
75 +
76 + clean:
77 +- rm -f *.o $(CLEANFILES) .depend
78 ++ $(RM) *.o $(CLEANFILES) .depend
79 +
80 + $(OBJS): prom_parse.tab.h prom_parse.h fwparam_ibft.h
81 +
82 + depend:
83 +- gcc $(CFLAGS) -M `ls *.c` > .depend
84 ++ $(CC) $(CFLAGS) -M `ls *.c` > .depend
85 +
86 + -include .depend
87 +--- a/utils/sysdeps/Makefile
88 ++++ b/utils/sysdeps/Makefile
89 +@@ -8,9 +8,9 @@ SYSDEPS_OBJS=sysdeps.o
90 + all: $(SYSDEPS_OBJS)
91 +
92 + clean:
93 +- rm -f *.o .depend
94 ++ $(RM) *.o .depend
95 +
96 + depend:
97 +- gcc $(CFLAGS) -M `ls *.c` > .depend
98 ++ $(CC) $(CFLAGS) -M `ls *.c` > .depend
99 +
100 + -include .depend
101
102 diff --git a/sys-block/open-iscsi/open-iscsi-2.1.1.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.1.ebuild
103 index 43f3ee2b89f..d7ff6b52509 100644
104 --- a/sys-block/open-iscsi/open-iscsi-2.1.1.ebuild
105 +++ b/sys-block/open-iscsi/open-iscsi-2.1.1.ebuild
106 @@ -31,7 +31,7 @@ BDEPEND="virtual/pkgconfig"
107 REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
108
109 PATCHES=(
110 - "${FILESDIR}/${PN}-2.0.876-Makefiles.patch"
111 + "${FILESDIR}/${PN}-2.1.1-Makefiles.patch"
112 )
113
114 pkg_setup() {