* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/libnodave/files/, dev-libs/libnodave/
@ 2021-04-20 9:43 Andrew Ammerlaan
0 siblings, 0 replies; only message in thread
From: Andrew Ammerlaan @ 2021-04-20 9:43 UTC (permalink / raw
To: gentoo-commits
commit: bc70713eb6e2bad3c224c696165c26469ce21f5a
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Mon Apr 19 16:06:37 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon Apr 19 16:07:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bc70713e
dev-libs/libnodave: install test executables
Closes: https://bugs.gentoo.org/783993
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
dev-libs/libnodave/files/makefile-0.8.5.1.patch | 159 +++++++++++++--------
dev-libs/libnodave/files/perl-makefile.patch | 11 ++
...-0.8.5.1.ebuild => libnodave-0.8.5.1-r1.ebuild} | 34 +++--
3 files changed, 136 insertions(+), 68 deletions(-)
diff --git a/dev-libs/libnodave/files/makefile-0.8.5.1.patch b/dev-libs/libnodave/files/makefile-0.8.5.1.patch
index 467cc13cb..2a9603c1d 100644
--- a/dev-libs/libnodave/files/makefile-0.8.5.1.patch
+++ b/dev-libs/libnodave/files/makefile-0.8.5.1.patch
@@ -1,111 +1,152 @@
---- a/Makefile
-+++ b/Makefile
-@@ -13,7 +13,7 @@
+--- a/Makefile 2021-04-19 17:10:57.282266311 +0200
++++ b/Makefile 2021-04-19 17:27:25.063629828 +0200
+@@ -13,9 +13,9 @@
# To test with g++ which does stricter type checking:
#
##CC=g++
-CFLAGS=-Wall -Winline -DLINUX -DDAVE_LITTLE_ENDIAN
-+CFLAGS+=-fPIC -Wall -Winline -DLINUX -DDAVE_LITTLE_ENDIAN
++CFLAGS+=-Wall -Winline
CTFLAGS=-Wall -Winline -fPID -DLINUX -DDAVE_LITTLE_ENDIAN
- CPPFLAGS=-Wall -Winline -DLINUX -DDAVE_LITTLE_ENDIAN
+-CPPFLAGS=-Wall -Winline -DLINUX -DDAVE_LITTLE_ENDIAN
++CPPFLAGS+=-DLINUX -DDAVE_LITTLE_ENDIAN
#
-@@ -73,71 +73,71 @@
+ # The following is needed to enable workarounds for statements that do
+ # not work on (some?) ARM processors:
+@@ -45,7 +45,7 @@
+
+ DYNAMIC_PROGRAMS=testMPId testPPId testISO_TCPd
+
+-LIBRARIES=libnodave.so
++LIBRARIES=libnodave.so
+
+
+ all: $(PROGRAMS) $(LIBRARIES)
+@@ -72,74 +72,74 @@
+ testPPI_IBHload.o: nodave.h
testNLpro.o: benchmark.c nodavesimple.h
- testISO_TCP: nodave.o openSocket.o testISO_TCP.o
+-testISO_TCP: nodave.o openSocket.o testISO_TCP.o
- $(CC) $(LDFLAGS) nodave.o openSocket.o testISO_TCP.o -o testISO_TCP
-+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodave.o openSocket.o testISO_TCP.o -o testISO_TCP
- testISO2: nodave.o openSocket.o testISO2.o
+-testISO2: nodave.o openSocket.o testISO2.o
- $(CC) $(LDFLAGS) nodave.o openSocket.o testISO2.o -o testISO2
-+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodave.o openSocket.o testISO2.o -o testISO2
- testISO_TCPd: nodave.o openSocket.o testISO_TCP.o
+-testISO_TCPd: nodave.o openSocket.o testISO_TCP.o
- $(CC) -lnodave testISO_TCP.o -o testISO_TCPd
-+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testISO_TCP.o -o testISO_TCPd -lnodave
- testPPIload: nodave.o setport.o testPPIload.o
+-testPPIload: nodave.o setport.o testPPIload.o
- $(CC) $(LDFLAGS) nodave.o setport.o testPPIload.o -o testPPIload
-+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodave.o setport.o testPPIload.o -o testPPIload
- testMPI: setport.o testMPI.o nodave.o
+-testMPI: setport.o testMPI.o nodave.o
- $(CC) $(LDFLAGS) setport.o nodave.o testMPI.o -o testMPI
-+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE setport.o nodave.o testMPI.o -o testMPI
- testMPImin: setport.o testMPImin.o nodave.o
+-testMPImin: setport.o testMPImin.o nodave.o
- $(CC) $(LDFLAGS) setport.o nodave.o testMPImin.o -o testMPImin
-+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE setport.o nodave.o testMPImin.o -o testMPImin
- testMPId: setport.o testMPI.o nodave.o
+-testMPId: setport.o testMPI.o nodave.o
- $(CC) -lnodave testMPI.o -o testMPId
-+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testMPI.o -o testMPId -lnodave
- testMPIload: nodave.o setport.o testMPIload.o
+-testMPIload: nodave.o setport.o testMPIload.o
- $(CC) $(LDFLAGS) nodave.o setport.o testMPIload.o -o testMPIload
-+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodave.o setport.o testMPIload.o -o testMPIload
- testMPI_IBHload: nodave.o openSocket.o testMPI_IBHload.o
+-testMPI_IBHload: nodave.o openSocket.o testMPI_IBHload.o
- $(CC) $(LDFLAGS) nodave.o openSocket.o testMPI_IBHload.o -o testMPI_IBHload
-+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodave.o openSocket.o testMPI_IBHload.o -o testMPI_IBHload
- testPPI: nodave.o setport.o testPPI.o
+-testPPI: nodave.o setport.o testPPI.o
- $(CC) $(LDFLAGS) nodave.o setport.o testPPI.o -o testPPI
-+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodave.o setport.o testPPI.o -o testPPI
- testPPId: nodave.o setport.o testPPI.o
+-testPPId: nodave.o setport.o testPPI.o
- $(CC) -lnodave testPPI.o -o testPPId
-+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testPPI.o -o testPPId -lnodave
- testISO_TCPload: nodave.o openSocket.o testISO_TCPload.o
+-testISO_TCPload: nodave.o openSocket.o testISO_TCPload.o
- $(CC) $(LDFLAGS) nodave.o openSocket.o testISO_TCPload.o -o testISO_TCPload
-+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodave.o openSocket.o testISO_TCPload.o -o testISO_TCPload
- testIBH: openSocket.o testIBH.o nodave.o
+-testIBH: openSocket.o testIBH.o nodave.o
- $(CC) $(LDFLAGS) openSocket.o nodave.o testIBH.o -o testIBH
-+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE openSocket.o nodave.o testIBH.o -o testIBH
- testPPI_IBH: openSocket.o testPPI_IBH.o nodave.o
+-testPPI_IBH: openSocket.o testPPI_IBH.o nodave.o
- $(CC) $(LDFLAGS) openSocket.o nodave.o testPPI_IBH.o -o testPPI_IBH
-+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE openSocket.o nodave.o testPPI_IBH.o -o testPPI_IBH
- testPPI_IBHload: openSocket.o testPPI_IBHload.o nodave.o
+-testPPI_IBHload: openSocket.o testPPI_IBHload.o nodave.o
- $(CC) $(LDFLAGS) openSocket.o nodave.o testPPI_IBHload.o -o testPPI_IBHload
-+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE openSocket.o nodave.o testPPI_IBHload.o -o testPPI_IBHload
- testPPIcpp: nodave.o setport.o testPPIcpp.o
+-testPPIcpp: nodave.o setport.o testPPIcpp.o
- $(CC) $(LDFLAGS) nodave.o setport.o testPPIcpp.o -o testPPIcpp
-+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodave.o setport.o testPPIcpp.o -o testPPIcpp
- testMPI2: setport.o testMPI2.o nodave.o nodaveext.o
+-testMPI2: setport.o testMPI2.o nodave.o nodaveext.o
- $(CC) $(LDFLAGS) setport.o nodave.o nodaveext.o testMPI2.o -o testMPI2
-+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE setport.o nodave.o nodaveext.o testMPI2.o -o testMPI2
- testAS511: setport.o testAS511.o nodave.o
+-testAS511: setport.o testAS511.o nodave.o
- $(CC) $(LDFLAGS) setport.o nodave.o testAS511.o -o testAS511
-+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE setport.o nodave.o testAS511.o -o testAS511
- testUSB: testUSB.o nodave.o usbGlue.o usbGlue.h
+-testUSB: testUSB.o nodave.o usbGlue.o usbGlue.h
- $(CC) $(LDFLAGS) nodave.o testUSB.o usbGlue.o -lusb -o testUSB
-+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodave.o testUSB.o usbGlue.o -lusb -o testUSB
- testNLpro: openSocket.o testNLpro.o nodave.o
+-testNLpro: openSocket.o testNLpro.o nodave.o
- $(CC) $(LDFLAGS) openSocket.o nodave.o testNLpro.o -o testNLpro
-+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE openSocket.o nodave.o testNLpro.o -o testNLpro
++testISO_TCP: libnodave.so testISO_TCP.o
++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testISO_TCP.o -o testISO_TCP -lnodave
++testISO2: libnodave.so testISO2.o
++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testISO2.o -o testISO2 -lnodave
++testISO_TCPd: libnodave.so testISO_TCP.o
++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE -lnodave testISO_TCP.o -o testISO_TCPd -lnodave
++testPPIload: libnodave.so testPPIload.o
++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testPPIload.o -o testPPIload -lnodave
++testMPI: testMPI.o libnodave.so
++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testMPI.o -o testMPI -lnodave
++testMPImin: testMPImin.o libnodave.so
++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testMPImin.o -o testMPImin -lnodave
++testMPId: testMPI.o libnodave.so
++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE -lnodave testMPI.o -o testMPId -lnodave
++testMPIload: libnodave.so testMPIload.o
++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testMPIload.o -o testMPIload -lnodave
++testMPI_IBHload: libnodave.so testMPI_IBHload.o
++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testMPI_IBHload.o -o testMPI_IBHload -lnodave
++testPPI: libnodave.so testPPI.o
++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testPPI.o -o testPPI -lnodave
++testPPId: libnodave.so testPPI.o
++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE -lnodave testPPI.o -o testPPId -lnodave
++testISO_TCPload: libnodave.so testISO_TCPload.o
++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testISO_TCPload.o -o testISO_TCPload -lnodave
++testIBH: testIBH.o libnodave.so
++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testIBH.o -o testIBH -lnodave
++testPPI_IBH: testPPI_IBH.o libnodave.so
++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testPPI_IBH.o -o testPPI_IBH -lnodave
++testPPI_IBHload: testPPI_IBHload.o libnodave.so
++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testPPI_IBHload.o -o testPPI_IBHload -lnodave
++testPPIcpp: libnodave.so testPPIcpp.o
++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testPPIcpp.o -o testPPIcpp -lnodave
++testMPI2: testMPI2.o libnodave.so nodaveext.o
++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodaveext.o testMPI2.o -o testMPI2 -lnodave
++testAS511: testAS511.o libnodave.so
++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testAS511.o -o testAS511 -lnodave
++testUSB: testUSB.o libnodave.so usbGlue.o usbGlue.h
++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testUSB.o usbGlue.o -lusb -o testUSB -lnodave
++testNLpro: testNLpro.o libnodave.so
++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testNLpro.o -o testNLpro -lnodave
crc: crc.o
- $(CC) $(LDFLAGS) crc.o -o crc
+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE crc.o -o crc
crc3: crc3.o
- $(CC) $(LDFLAGS) crc3.o -o crc3
-+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE crc3.o -o crc3
- testHTTP: nodave.o openSocket.o testHTTP.o
+-testHTTP: nodave.o openSocket.o testHTTP.o
- $(CC) $(LDFLAGS) nodave.o openSocket.o testHTTP.o -o testHTTP
-+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE nodave.o openSocket.o testHTTP.o -o testHTTP
++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE crc3.o -o crc3
++testHTTP: libnodave.so testHTTP.o
++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE testHTTP.o -o testHTTP -lnodave
ibhsim9.o: simProperties2.c blocklist.h
- ibhsim9: ibhsim9.o nodave.h nodave.o openSocket.o openSocket.h blocklist.o blocklist2.o setport.o
+-ibhsim9: ibhsim9.o nodave.h nodave.o openSocket.o openSocket.h blocklist.o blocklist2.o setport.o
- $(CC) -lpthread ibhsim9.o openSocket.o nodave.o blocklist.o blocklist2.o setport.o -o ibhsim9
-+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE -lpthread ibhsim9.o openSocket.o nodave.o blocklist.o blocklist2.o setport.o -o ibhsim9
++ibhsim9: ibhsim9.o nodave.h libnodave.so openSocket.h blocklist.o blocklist2.o
++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE -lpthread ibhsim9.o blocklist.o blocklist2.o -o ibhsim9 -lnodave
ibhsim10.o: simProperties2.c blocklist.h
- ibhsim10: ibhsim10.o nodave.h nodave.o openSocket.o openSocket.h blocklist.o blocklist2.o setport.o emulator.o
+-ibhsim10: ibhsim10.o nodave.h nodave.o openSocket.o openSocket.h blocklist.o blocklist2.o setport.o emulator.o
- $(CC) -lm -lpthread ibhsim10.o openSocket.o nodave.o blocklist.o blocklist2.o setport.o emulator.o -o ibhsim10
-+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE -lm -lpthread ibhsim10.o openSocket.o nodave.o blocklist.o blocklist2.o setport.o emulator.o -o ibhsim10
++ibhsim10: ibhsim10.o nodave.h libnodave.so openSocket.h blocklist.o blocklist2.o emulator.o
++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE -lm -lpthread ibhsim10.o blocklist.o blocklist2.o emulator.o -o ibhsim10 -lnodave
libnodave.so: nodave.o setport.o openSocket.o
- $(LD) -shared nodave.o setport.o openSocket.o -o libnodave.so
-+ $(CC) $(CFLAGS) $(LDFLAGS) -shared nodave.o setport.o openSocket.o -Wl,-soname,libnodave.so.0 -o libnodave.so.0
++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIC -shared nodave.o setport.o openSocket.o -Wl,-soname,libnodave.so.0 -o libnodave.so.0
#
# for some reason, -lpthread now has to be at the end of the linker command line...05/17/2013
#
ibhsim5.o: simProperties.c
- ibhsim5: ibhsim5.o nodave.h nodave.o openSocket.o openSocket.h
+-ibhsim5: ibhsim5.o nodave.h nodave.o openSocket.o openSocket.h
- $(CC) ibhsim5.o openSocket.o nodave.o -lpthread -o ibhsim5
-+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE ibhsim5.o openSocket.o nodave.o -lpthread -o ibhsim5
- isotest4: isotest4.o openSocket.o nodave.o nodave.h
+-isotest4: isotest4.o openSocket.o nodave.o nodave.h
- $(CC) $(LDFLAGS) isotest4.o openSocket.o nodave.o $(LIB) -lpthread -o isotest4
-+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE isotest4.o openSocket.o nodave.o $(LIB) -lpthread -o isotest4
++ibhsim5: ibhsim5.o nodave.h libnodave.so openSocket.h
++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE ibhsim5.o -lpthread -o ibhsim5 -lnodave
++isotest4: isotest4.o libnodave.so nodave.h
++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIE isotest4.o $(LIB) -lpthread -o isotest4 -lnodave
- clean:
+-clean:
++clean:
rm -f $(DYNAMIC_PROGRAMS)
+ rm -f $(PROGRAMS)
+ rm -f *.o
diff --git a/dev-libs/libnodave/files/perl-makefile.patch b/dev-libs/libnodave/files/perl-makefile.patch
new file mode 100644
index 000000000..4ac3355a5
--- /dev/null
+++ b/dev-libs/libnodave/files/perl-makefile.patch
@@ -0,0 +1,11 @@
+--- a/PERL/Makefile.PL 2021-04-19 17:30:19.964446618 +0200
++++ b/PERL/Makefile.PL 2021-04-19 17:30:47.392884824 +0200
+@@ -11,7 +11,7 @@
+ AUTHOR => 'Thomas Hergenhahn <thomas.hergenhahn@web,de>') : ()),
+ LIBS => ['-lnodave'], # e.g., '-lm'
+ DEFINE => '', # e.g., '-DHAVE_SOMETHING'
+- INC => '-I.', # e.g., '-I. -I/usr/include/other'
++ INC => '-I. -I..', # e.g., '-I. -I/usr/include/other'
+ # Un-comment this if you add C files to link with later:
+ # OBJECT => '$(O_FILES)', # link all the C files too
+ );
diff --git a/dev-libs/libnodave/libnodave-0.8.5.1.ebuild b/dev-libs/libnodave/libnodave-0.8.5.1-r1.ebuild
similarity index 71%
rename from dev-libs/libnodave/libnodave-0.8.5.1.ebuild
rename to dev-libs/libnodave/libnodave-0.8.5.1-r1.ebuild
index f4eacad4c..9b0e5a1b6 100644
--- a/dev-libs/libnodave/libnodave-0.8.5.1.ebuild
+++ b/dev-libs/libnodave/libnodave-0.8.5.1-r1.ebuild
@@ -19,14 +19,12 @@ RDEPEND="
perl? ( dev-lang/perl:= )
"
BDEPEND=""
-PATCHES=( "${FILESDIR}/makefile-${PV}.patch" )
+PATCHES=(
+ "${FILESDIR}/makefile-${PV}.patch"
+ "${FILESDIR}/perl-makefile.patch"
+)
DOCS=( ChangeLog readme faq.txt FAQ.de.txt )
-src_prepare() {
- sed -e "s|-I.|-I. -I..|g" -i PERL/Makefile.PL || die
- default
-}
-
src_configure() {
if use perl; then
cd "${S}/PERL" || die
@@ -36,11 +34,10 @@ src_configure() {
}
src_compile() {
- append-cflags "-L${S}"
+ append-cflags "-L${S} -fPIC"
emake clean
- emake CC="$(tc-getCC)"
+ emake CC="$(tc-getCC)" all
ln -s libnodave.so.0 libnodave.so || die
-# emake CC="$(tc-getCC)" dynamic
if use perl; then
cd "${S}/PERL" || die
@@ -49,6 +46,25 @@ src_compile() {
}
src_install() {
+ local programs=(
+ testIBH
+ testISO_TCP
+ testMPI
+ testPPI
+ testPPIload
+ testMPIload
+ testISO_TCPload
+ testMPI_IBHload
+ testPPI_IBHload
+ testPPI_IBH
+ testNLpro
+ testAS511
+ isotest4
+ ibhsim5
+ )
+ exeinto "/usr/libexec"
+ doexe "${programs[@]}"
+
dolib.so libnodave.so.0 libnodave.so
doheader nodave.h
use doc && HTML_DOCS=( doc/*.html )
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-04-20 9:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-20 9:43 [gentoo-commits] repo/proj/guru:master commit in: dev-libs/libnodave/files/, dev-libs/libnodave/ Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox