1 |
commit: c381d2a51249c41ce1b0322884f324db769feb66 |
2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
3 |
AuthorDate: Mon Dec 28 11:50:16 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 28 11:50:16 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c381d2a5 |
7 |
|
8 |
sys-block/vblade: fix build with gcc-10 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/707480 |
11 |
Package-Manager: Portage-3.0.9, Repoman-3.0.1 |
12 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
13 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
14 |
|
15 |
sys-block/vblade/files/vblade-24-fno-common.patch | 48 +++++++++++++++++++++++ |
16 |
sys-block/vblade/files/vblade-24-makefile.patch | 35 +++++++++++++++++ |
17 |
sys-block/vblade/vblade-24.ebuild | 19 +++++---- |
18 |
3 files changed, 92 insertions(+), 10 deletions(-) |
19 |
|
20 |
diff --git a/sys-block/vblade/files/vblade-24-fno-common.patch b/sys-block/vblade/files/vblade-24-fno-common.patch |
21 |
new file mode 100644 |
22 |
index 00000000000..2a51ddea470 |
23 |
--- /dev/null |
24 |
+++ b/sys-block/vblade/files/vblade-24-fno-common.patch |
25 |
@@ -0,0 +1,48 @@ |
26 |
+Taken from: https://github.com/OpenAoE/vblade/pull/15 |
27 |
+Author: Andreas Kölbl <koelblandreas@×××××××.de> |
28 |
+ |
29 |
+--- /dev/null |
30 |
++++ b/dat.c |
31 |
+@@ -0,0 +1,12 @@ |
32 |
++/* dat.c: Global memory for vblade AoE target */ |
33 |
++#include "dat.h" |
34 |
++ |
35 |
++int shelf, slot; |
36 |
++ulong aoetag; |
37 |
++uchar mac[6]; |
38 |
++int bfd; // block file descriptor |
39 |
++int sfd; // socket file descriptor |
40 |
++vlong size; // size of vblade |
41 |
++vlong offset; |
42 |
++char *progname; |
43 |
++char serial[Nserial+1]; |
44 |
+--- a/dat.h |
45 |
++++ b/dat.h |
46 |
+@@ -1,4 +1,5 @@ |
47 |
+ /* dat.h: include file for vblade AoE target */ |
48 |
++#include <sys/types.h> |
49 |
+ |
50 |
+ #define nil ((void *)0) |
51 |
+ /* |
52 |
+@@ -163,12 +164,12 @@ enum { |
53 |
+ Nserial= 20, |
54 |
+ }; |
55 |
+ |
56 |
+-int shelf, slot; |
57 |
+-ulong aoetag; |
58 |
+-uchar mac[6]; |
59 |
+-int bfd; // block file descriptor |
60 |
+-int sfd; // socket file descriptor |
61 |
+-vlong size; // size of vblade |
62 |
+-vlong offset; |
63 |
+-char *progname; |
64 |
+-char serial[Nserial+1]; |
65 |
++extern int shelf, slot; |
66 |
++extern ulong aoetag; |
67 |
++extern uchar mac[6]; |
68 |
++extern int bfd; // block file descriptor |
69 |
++extern int sfd; // socket file descriptor |
70 |
++extern vlong size; // size of vblade |
71 |
++extern vlong offset; |
72 |
++extern char *progname; |
73 |
++extern char serial[Nserial+1]; |
74 |
|
75 |
diff --git a/sys-block/vblade/files/vblade-24-makefile.patch b/sys-block/vblade/files/vblade-24-makefile.patch |
76 |
new file mode 100644 |
77 |
index 00000000000..ed5efb2c2e2 |
78 |
--- /dev/null |
79 |
+++ b/sys-block/vblade/files/vblade-24-makefile.patch |
80 |
@@ -0,0 +1,35 @@ |
81 |
+--- a/makefile |
82 |
++++ b/makefile |
83 |
+@@ -8,27 +8,22 @@ |
84 |
+ sharedir = ${prefix}/share |
85 |
+ mandir = ${sharedir}/man |
86 |
+ |
87 |
+-O=aoe.o bpf.o ${PLATFORM}.o ata.o |
88 |
+-CFLAGS += -Wall -g -O2 |
89 |
+-CC = gcc |
90 |
++O=aoe.o bpf.o ${PLATFORM}.o ata.o dat.o |
91 |
++CFLAGS += -Wall |
92 |
+ |
93 |
+ vblade: $O |
94 |
+- ${CC} -o vblade $O |
95 |
++ ${CC} ${LDFLAGS} -o vblade $O ${LIBS} |
96 |
+ |
97 |
+ aoe.o : aoe.c config.h dat.h fns.h makefile |
98 |
+- ${CC} ${CFLAGS} -c $< |
99 |
+ |
100 |
+ ${PLATFORM}.o : ${PLATFORM}.c config.h dat.h fns.h makefile |
101 |
+- ${CC} ${CFLAGS} -c $< |
102 |
+ |
103 |
+ ata.o : ata.c config.h dat.h fns.h makefile |
104 |
+- ${CC} ${CFLAGS} -c $< |
105 |
+ |
106 |
+-bpf.o : bpf.c |
107 |
+- ${CC} ${CFLAGS} -c $< |
108 |
++dat.o : dat.c |
109 |
+ |
110 |
+ config.h : config/config.h.in makefile |
111 |
+- @if ${CC} ${CFLAGS} config/u64.c > /dev/null 2>&1; then \ |
112 |
++ @if ${CC} ${CFLAGS} ${CPPFLAGS} config/u64.c > /dev/null 2>&1; then \ |
113 |
+ sh -xc "cp config/config.h.in config.h"; \ |
114 |
+ else \ |
115 |
+ sh -xc "sed 's!^//u64 !!' config/config.h.in > config.h"; \ |
116 |
|
117 |
diff --git a/sys-block/vblade/vblade-24.ebuild b/sys-block/vblade/vblade-24.ebuild |
118 |
index 418e75559d0..e8ee9b2db33 100644 |
119 |
--- a/sys-block/vblade/vblade-24.ebuild |
120 |
+++ b/sys-block/vblade/vblade-24.ebuild |
121 |
@@ -1,7 +1,7 @@ |
122 |
# Copyright 1999-2020 Gentoo Authors |
123 |
# Distributed under the terms of the GNU General Public License v2 |
124 |
|
125 |
-EAPI="6" |
126 |
+EAPI=7 |
127 |
|
128 |
inherit toolchain-funcs |
129 |
|
130 |
@@ -17,23 +17,22 @@ RDEPEND="sys-apps/util-linux" |
131 |
|
132 |
S="${WORKDIR}/${PN}-${P}" |
133 |
|
134 |
-src_prepare() { |
135 |
- default |
136 |
+PATCHES=( |
137 |
+ "${FILESDIR}"/${P}-fno-common.patch |
138 |
+ "${FILESDIR}"/${P}-makefile.patch |
139 |
+) |
140 |
|
141 |
- sed -i -e 's,^CFLAGS.*,CFLAGS += -Wall,' \ |
142 |
- -e 's:-o vblade:${LDFLAGS} \0:' \ |
143 |
- makefile || die |
144 |
-} |
145 |
- |
146 |
-src_compile() { |
147 |
- emake CC="$(tc-getCC)" |
148 |
+src_configure() { |
149 |
+ tc-export CC |
150 |
} |
151 |
|
152 |
src_install() { |
153 |
dosbin vblade |
154 |
dosbin "${FILESDIR}"/vbladed |
155 |
+ |
156 |
doman vblade.8 |
157 |
dodoc HACKING NEWS README |
158 |
+ |
159 |
newconfd "${FILESDIR}"/conf.d-vblade vblade |
160 |
newinitd "${FILESDIR}"/init.d-vblade.vblade0-r2 vblade.vblade0 |
161 |
} |