Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@××××××.net>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: dev-libs/libnodave/files/, dev-libs/libnodave/
Date: Tue, 20 Apr 2021 09:43:58
Message-Id: 1618848447.bc70713eb6e2bad3c224c696165c26469ce21f5a.andrewammerlaan@gentoo
1 commit: bc70713eb6e2bad3c224c696165c26469ce21f5a
2 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
3 AuthorDate: Mon Apr 19 16:06:37 2021 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
5 CommitDate: Mon Apr 19 16:07:27 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bc70713e
7
8 dev-libs/libnodave: install test executables
9
10 Closes: https://bugs.gentoo.org/783993
11 Package-Manager: Portage-3.0.18, Repoman-3.0.3
12 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
13
14 dev-libs/libnodave/files/makefile-0.8.5.1.patch | 159 +++++++++++++--------
15 dev-libs/libnodave/files/perl-makefile.patch | 11 ++
16 ...-0.8.5.1.ebuild => libnodave-0.8.5.1-r1.ebuild} | 34 +++--
17 3 files changed, 136 insertions(+), 68 deletions(-)
18
19 diff --git a/dev-libs/libnodave/files/makefile-0.8.5.1.patch b/dev-libs/libnodave/files/makefile-0.8.5.1.patch
20 index 467cc13cb..2a9603c1d 100644
21 --- a/dev-libs/libnodave/files/makefile-0.8.5.1.patch
22 +++ b/dev-libs/libnodave/files/makefile-0.8.5.1.patch
23 @@ -1,111 +1,152 @@
24 ---- a/Makefile
25 -+++ b/Makefile
26 -@@ -13,7 +13,7 @@
27 +--- a/Makefile 2021-04-19 17:10:57.282266311 +0200
28 ++++ b/Makefile 2021-04-19 17:27:25.063629828 +0200
29 +@@ -13,9 +13,9 @@
30 # To test with g++ which does stricter type checking:
31 #
32 ##CC=g++
33 -CFLAGS=-Wall -Winline -DLINUX -DDAVE_LITTLE_ENDIAN
34 -+CFLAGS+=-fPIC -Wall -Winline -DLINUX -DDAVE_LITTLE_ENDIAN
35 ++CFLAGS+=-Wall -Winline
36 CTFLAGS=-Wall -Winline -fPID -DLINUX -DDAVE_LITTLE_ENDIAN
37 - CPPFLAGS=-Wall -Winline -DLINUX -DDAVE_LITTLE_ENDIAN
38 +-CPPFLAGS=-Wall -Winline -DLINUX -DDAVE_LITTLE_ENDIAN
39 ++CPPFLAGS+=-DLINUX -DDAVE_LITTLE_ENDIAN
40 #
41 -@@ -73,71 +73,71 @@
42 + # The following is needed to enable workarounds for statements that do
43 + # not work on (some?) ARM processors:
44 +@@ -45,7 +45,7 @@
45 +
46 + DYNAMIC_PROGRAMS=testMPId testPPId testISO_TCPd
47 +
48 +-LIBRARIES=libnodave.so
49 ++LIBRARIES=libnodave.so
50 +
51 +
52 + all: $(PROGRAMS) $(LIBRARIES)
53 +@@ -72,74 +72,74 @@
54 + testPPI_IBHload.o: nodave.h
55 testNLpro.o: benchmark.c nodavesimple.h
56
57 - testISO_TCP: nodave.o openSocket.o testISO_TCP.o
58 +-testISO_TCP: nodave.o openSocket.o testISO_TCP.o
59 - $(CC) $(LDFLAGS) nodave.o openSocket.o testISO_TCP.o -o testISO_TCP
60 -+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodave.o openSocket.o testISO_TCP.o -o testISO_TCP
61 - testISO2: nodave.o openSocket.o testISO2.o
62 +-testISO2: nodave.o openSocket.o testISO2.o
63 - $(CC) $(LDFLAGS) nodave.o openSocket.o testISO2.o -o testISO2
64 -+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodave.o openSocket.o testISO2.o -o testISO2
65 - testISO_TCPd: nodave.o openSocket.o testISO_TCP.o
66 +-testISO_TCPd: nodave.o openSocket.o testISO_TCP.o
67 - $(CC) -lnodave testISO_TCP.o -o testISO_TCPd
68 -+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testISO_TCP.o -o testISO_TCPd -lnodave
69 - testPPIload: nodave.o setport.o testPPIload.o
70 +-testPPIload: nodave.o setport.o testPPIload.o
71 - $(CC) $(LDFLAGS) nodave.o setport.o testPPIload.o -o testPPIload
72 -+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodave.o setport.o testPPIload.o -o testPPIload
73 - testMPI: setport.o testMPI.o nodave.o
74 +-testMPI: setport.o testMPI.o nodave.o
75 - $(CC) $(LDFLAGS) setport.o nodave.o testMPI.o -o testMPI
76 -+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE setport.o nodave.o testMPI.o -o testMPI
77 - testMPImin: setport.o testMPImin.o nodave.o
78 +-testMPImin: setport.o testMPImin.o nodave.o
79 - $(CC) $(LDFLAGS) setport.o nodave.o testMPImin.o -o testMPImin
80 -+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE setport.o nodave.o testMPImin.o -o testMPImin
81 - testMPId: setport.o testMPI.o nodave.o
82 +-testMPId: setport.o testMPI.o nodave.o
83 - $(CC) -lnodave testMPI.o -o testMPId
84 -+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testMPI.o -o testMPId -lnodave
85 - testMPIload: nodave.o setport.o testMPIload.o
86 +-testMPIload: nodave.o setport.o testMPIload.o
87 - $(CC) $(LDFLAGS) nodave.o setport.o testMPIload.o -o testMPIload
88 -+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodave.o setport.o testMPIload.o -o testMPIload
89 - testMPI_IBHload: nodave.o openSocket.o testMPI_IBHload.o
90 +-testMPI_IBHload: nodave.o openSocket.o testMPI_IBHload.o
91 - $(CC) $(LDFLAGS) nodave.o openSocket.o testMPI_IBHload.o -o testMPI_IBHload
92 -+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodave.o openSocket.o testMPI_IBHload.o -o testMPI_IBHload
93 - testPPI: nodave.o setport.o testPPI.o
94 +-testPPI: nodave.o setport.o testPPI.o
95 - $(CC) $(LDFLAGS) nodave.o setport.o testPPI.o -o testPPI
96 -+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodave.o setport.o testPPI.o -o testPPI
97 - testPPId: nodave.o setport.o testPPI.o
98 +-testPPId: nodave.o setport.o testPPI.o
99 - $(CC) -lnodave testPPI.o -o testPPId
100 -+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testPPI.o -o testPPId -lnodave
101 - testISO_TCPload: nodave.o openSocket.o testISO_TCPload.o
102 +-testISO_TCPload: nodave.o openSocket.o testISO_TCPload.o
103 - $(CC) $(LDFLAGS) nodave.o openSocket.o testISO_TCPload.o -o testISO_TCPload
104 -+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodave.o openSocket.o testISO_TCPload.o -o testISO_TCPload
105 - testIBH: openSocket.o testIBH.o nodave.o
106 +-testIBH: openSocket.o testIBH.o nodave.o
107 - $(CC) $(LDFLAGS) openSocket.o nodave.o testIBH.o -o testIBH
108 -+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE openSocket.o nodave.o testIBH.o -o testIBH
109 - testPPI_IBH: openSocket.o testPPI_IBH.o nodave.o
110 +-testPPI_IBH: openSocket.o testPPI_IBH.o nodave.o
111 - $(CC) $(LDFLAGS) openSocket.o nodave.o testPPI_IBH.o -o testPPI_IBH
112 -+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE openSocket.o nodave.o testPPI_IBH.o -o testPPI_IBH
113 - testPPI_IBHload: openSocket.o testPPI_IBHload.o nodave.o
114 +-testPPI_IBHload: openSocket.o testPPI_IBHload.o nodave.o
115 - $(CC) $(LDFLAGS) openSocket.o nodave.o testPPI_IBHload.o -o testPPI_IBHload
116 -+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE openSocket.o nodave.o testPPI_IBHload.o -o testPPI_IBHload
117 - testPPIcpp: nodave.o setport.o testPPIcpp.o
118 +-testPPIcpp: nodave.o setport.o testPPIcpp.o
119 - $(CC) $(LDFLAGS) nodave.o setport.o testPPIcpp.o -o testPPIcpp
120 -+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodave.o setport.o testPPIcpp.o -o testPPIcpp
121 - testMPI2: setport.o testMPI2.o nodave.o nodaveext.o
122 +-testMPI2: setport.o testMPI2.o nodave.o nodaveext.o
123 - $(CC) $(LDFLAGS) setport.o nodave.o nodaveext.o testMPI2.o -o testMPI2
124 -+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE setport.o nodave.o nodaveext.o testMPI2.o -o testMPI2
125 - testAS511: setport.o testAS511.o nodave.o
126 +-testAS511: setport.o testAS511.o nodave.o
127 - $(CC) $(LDFLAGS) setport.o nodave.o testAS511.o -o testAS511
128 -+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE setport.o nodave.o testAS511.o -o testAS511
129 - testUSB: testUSB.o nodave.o usbGlue.o usbGlue.h
130 +-testUSB: testUSB.o nodave.o usbGlue.o usbGlue.h
131 - $(CC) $(LDFLAGS) nodave.o testUSB.o usbGlue.o -lusb -o testUSB
132 -+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodave.o testUSB.o usbGlue.o -lusb -o testUSB
133 - testNLpro: openSocket.o testNLpro.o nodave.o
134 +-testNLpro: openSocket.o testNLpro.o nodave.o
135 - $(CC) $(LDFLAGS) openSocket.o nodave.o testNLpro.o -o testNLpro
136 -+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE openSocket.o nodave.o testNLpro.o -o testNLpro
137 ++testISO_TCP: libnodave.so testISO_TCP.o
138 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testISO_TCP.o -o testISO_TCP -lnodave
139 ++testISO2: libnodave.so testISO2.o
140 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testISO2.o -o testISO2 -lnodave
141 ++testISO_TCPd: libnodave.so testISO_TCP.o
142 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE -lnodave testISO_TCP.o -o testISO_TCPd -lnodave
143 ++testPPIload: libnodave.so testPPIload.o
144 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testPPIload.o -o testPPIload -lnodave
145 ++testMPI: testMPI.o libnodave.so
146 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testMPI.o -o testMPI -lnodave
147 ++testMPImin: testMPImin.o libnodave.so
148 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testMPImin.o -o testMPImin -lnodave
149 ++testMPId: testMPI.o libnodave.so
150 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE -lnodave testMPI.o -o testMPId -lnodave
151 ++testMPIload: libnodave.so testMPIload.o
152 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testMPIload.o -o testMPIload -lnodave
153 ++testMPI_IBHload: libnodave.so testMPI_IBHload.o
154 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testMPI_IBHload.o -o testMPI_IBHload -lnodave
155 ++testPPI: libnodave.so testPPI.o
156 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testPPI.o -o testPPI -lnodave
157 ++testPPId: libnodave.so testPPI.o
158 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE -lnodave testPPI.o -o testPPId -lnodave
159 ++testISO_TCPload: libnodave.so testISO_TCPload.o
160 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testISO_TCPload.o -o testISO_TCPload -lnodave
161 ++testIBH: testIBH.o libnodave.so
162 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testIBH.o -o testIBH -lnodave
163 ++testPPI_IBH: testPPI_IBH.o libnodave.so
164 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testPPI_IBH.o -o testPPI_IBH -lnodave
165 ++testPPI_IBHload: testPPI_IBHload.o libnodave.so
166 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testPPI_IBHload.o -o testPPI_IBHload -lnodave
167 ++testPPIcpp: libnodave.so testPPIcpp.o
168 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testPPIcpp.o -o testPPIcpp -lnodave
169 ++testMPI2: testMPI2.o libnodave.so nodaveext.o
170 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodaveext.o testMPI2.o -o testMPI2 -lnodave
171 ++testAS511: testAS511.o libnodave.so
172 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testAS511.o -o testAS511 -lnodave
173 ++testUSB: testUSB.o libnodave.so usbGlue.o usbGlue.h
174 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testUSB.o usbGlue.o -lusb -o testUSB -lnodave
175 ++testNLpro: testNLpro.o libnodave.so
176 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testNLpro.o -o testNLpro -lnodave
177 crc: crc.o
178 - $(CC) $(LDFLAGS) crc.o -o crc
179 + $(CC) $(CFLAGS) $(LDFLAGS) -fPIE crc.o -o crc
180 crc3: crc3.o
181 - $(CC) $(LDFLAGS) crc3.o -o crc3
182 -+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE crc3.o -o crc3
183 - testHTTP: nodave.o openSocket.o testHTTP.o
184 +-testHTTP: nodave.o openSocket.o testHTTP.o
185 - $(CC) $(LDFLAGS) nodave.o openSocket.o testHTTP.o -o testHTTP
186 -+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodave.o openSocket.o testHTTP.o -o testHTTP
187 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE crc3.o -o crc3
188 ++testHTTP: libnodave.so testHTTP.o
189 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testHTTP.o -o testHTTP -lnodave
190 ibhsim9.o: simProperties2.c blocklist.h
191 - ibhsim9: ibhsim9.o nodave.h nodave.o openSocket.o openSocket.h blocklist.o blocklist2.o setport.o
192 +-ibhsim9: ibhsim9.o nodave.h nodave.o openSocket.o openSocket.h blocklist.o blocklist2.o setport.o
193 - $(CC) -lpthread ibhsim9.o openSocket.o nodave.o blocklist.o blocklist2.o setport.o -o ibhsim9
194 -+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE -lpthread ibhsim9.o openSocket.o nodave.o blocklist.o blocklist2.o setport.o -o ibhsim9
195 ++ibhsim9: ibhsim9.o nodave.h libnodave.so openSocket.h blocklist.o blocklist2.o
196 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE -lpthread ibhsim9.o blocklist.o blocklist2.o -o ibhsim9 -lnodave
197 ibhsim10.o: simProperties2.c blocklist.h
198 - ibhsim10: ibhsim10.o nodave.h nodave.o openSocket.o openSocket.h blocklist.o blocklist2.o setport.o emulator.o
199 +-ibhsim10: ibhsim10.o nodave.h nodave.o openSocket.o openSocket.h blocklist.o blocklist2.o setport.o emulator.o
200 - $(CC) -lm -lpthread ibhsim10.o openSocket.o nodave.o blocklist.o blocklist2.o setport.o emulator.o -o ibhsim10
201 -+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE -lm -lpthread ibhsim10.o openSocket.o nodave.o blocklist.o blocklist2.o setport.o emulator.o -o ibhsim10
202 ++ibhsim10: ibhsim10.o nodave.h libnodave.so openSocket.h blocklist.o blocklist2.o emulator.o
203 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE -lm -lpthread ibhsim10.o blocklist.o blocklist2.o emulator.o -o ibhsim10 -lnodave
204
205
206
207 libnodave.so: nodave.o setport.o openSocket.o
208 - $(LD) -shared nodave.o setport.o openSocket.o -o libnodave.so
209 -+ $(CC) $(CFLAGS) $(LDFLAGS) -shared nodave.o setport.o openSocket.o -Wl,-soname,libnodave.so.0 -o libnodave.so.0
210 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIC -shared nodave.o setport.o openSocket.o -Wl,-soname,libnodave.so.0 -o libnodave.so.0
211
212 #
213 # for some reason, -lpthread now has to be at the end of the linker command line...05/17/2013
214 #
215 ibhsim5.o: simProperties.c
216 - ibhsim5: ibhsim5.o nodave.h nodave.o openSocket.o openSocket.h
217 +-ibhsim5: ibhsim5.o nodave.h nodave.o openSocket.o openSocket.h
218 - $(CC) ibhsim5.o openSocket.o nodave.o -lpthread -o ibhsim5
219 -+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE ibhsim5.o openSocket.o nodave.o -lpthread -o ibhsim5
220 - isotest4: isotest4.o openSocket.o nodave.o nodave.h
221 +-isotest4: isotest4.o openSocket.o nodave.o nodave.h
222 - $(CC) $(LDFLAGS) isotest4.o openSocket.o nodave.o $(LIB) -lpthread -o isotest4
223 -+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE isotest4.o openSocket.o nodave.o $(LIB) -lpthread -o isotest4
224 ++ibhsim5: ibhsim5.o nodave.h libnodave.so openSocket.h
225 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE ibhsim5.o -lpthread -o ibhsim5 -lnodave
226 ++isotest4: isotest4.o libnodave.so nodave.h
227 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE isotest4.o $(LIB) -lpthread -o isotest4 -lnodave
228
229 - clean:
230 +-clean:
231 ++clean:
232 rm -f $(DYNAMIC_PROGRAMS)
233 + rm -f $(PROGRAMS)
234 + rm -f *.o
235
236 diff --git a/dev-libs/libnodave/files/perl-makefile.patch b/dev-libs/libnodave/files/perl-makefile.patch
237 new file mode 100644
238 index 000000000..4ac3355a5
239 --- /dev/null
240 +++ b/dev-libs/libnodave/files/perl-makefile.patch
241 @@ -0,0 +1,11 @@
242 +--- a/PERL/Makefile.PL 2021-04-19 17:30:19.964446618 +0200
243 ++++ b/PERL/Makefile.PL 2021-04-19 17:30:47.392884824 +0200
244 +@@ -11,7 +11,7 @@
245 + AUTHOR => 'Thomas Hergenhahn <thomas.hergenhahn@web,de>') : ()),
246 + LIBS => ['-lnodave'], # e.g., '-lm'
247 + DEFINE => '', # e.g., '-DHAVE_SOMETHING'
248 +- INC => '-I.', # e.g., '-I. -I/usr/include/other'
249 ++ INC => '-I. -I..', # e.g., '-I. -I/usr/include/other'
250 + # Un-comment this if you add C files to link with later:
251 + # OBJECT => '$(O_FILES)', # link all the C files too
252 + );
253
254 diff --git a/dev-libs/libnodave/libnodave-0.8.5.1.ebuild b/dev-libs/libnodave/libnodave-0.8.5.1-r1.ebuild
255 similarity index 71%
256 rename from dev-libs/libnodave/libnodave-0.8.5.1.ebuild
257 rename to dev-libs/libnodave/libnodave-0.8.5.1-r1.ebuild
258 index f4eacad4c..9b0e5a1b6 100644
259 --- a/dev-libs/libnodave/libnodave-0.8.5.1.ebuild
260 +++ b/dev-libs/libnodave/libnodave-0.8.5.1-r1.ebuild
261 @@ -19,14 +19,12 @@ RDEPEND="
262 perl? ( dev-lang/perl:= )
263 "
264 BDEPEND=""
265 -PATCHES=( "${FILESDIR}/makefile-${PV}.patch" )
266 +PATCHES=(
267 + "${FILESDIR}/makefile-${PV}.patch"
268 + "${FILESDIR}/perl-makefile.patch"
269 +)
270 DOCS=( ChangeLog readme faq.txt FAQ.de.txt )
271
272 -src_prepare() {
273 - sed -e "s|-I.|-I. -I..|g" -i PERL/Makefile.PL || die
274 - default
275 -}
276 -
277 src_configure() {
278 if use perl; then
279 cd "${S}/PERL" || die
280 @@ -36,11 +34,10 @@ src_configure() {
281 }
282
283 src_compile() {
284 - append-cflags "-L${S}"
285 + append-cflags "-L${S} -fPIC"
286 emake clean
287 - emake CC="$(tc-getCC)"
288 + emake CC="$(tc-getCC)" all
289 ln -s libnodave.so.0 libnodave.so || die
290 -# emake CC="$(tc-getCC)" dynamic
291
292 if use perl; then
293 cd "${S}/PERL" || die
294 @@ -49,6 +46,25 @@ src_compile() {
295 }
296
297 src_install() {
298 + local programs=(
299 + testIBH
300 + testISO_TCP
301 + testMPI
302 + testPPI
303 + testPPIload
304 + testMPIload
305 + testISO_TCPload
306 + testMPI_IBHload
307 + testPPI_IBHload
308 + testPPI_IBH
309 + testNLpro
310 + testAS511
311 + isotest4
312 + ibhsim5
313 + )
314 + exeinto "/usr/libexec"
315 + doexe "${programs[@]}"
316 +
317 dolib.so libnodave.so.0 libnodave.so
318 doheader nodave.h
319 use doc && HTML_DOCS=( doc/*.html )