Miroirs/slackbuilds_ponce
1
0
Fork 0
mirror of https://github.com/Ponce/slackbuilds synced 2024-11-16 19:50:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

network/unicornscan: Fixed build with gcc-5.3.0.

Browse source 
Signed-off-by: David Spencer <baildon.research@googlemail.com>
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
This commit is contained in:
David Spencer 2016-01-01 14:54:12 +00:00 committed by Willy Sudiarto Raharjo
parent 2289b5dc21
commit 9445defe3f
2 changed files with 53 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
network/unicornscan/patches/unicornscan-0.4.7-gcc5.patch Normal file
View file

@ -0,0 +1,51 @@
Patch by Robert Scheck <robert@fedoraproject.org> for unicornscan >= 0.4.7 to avoid
build failures with GCC 5.x such as "unicornscan-0.4.7/src/unilib/tsc.c:163:
undefined reference to `get_tsc'" (occurring in some different source code lines).
--- unicornscan-0.4.7/src/unilib/tsc.c 2006-10-18 18:57:05.000000000 +0200
+++ unicornscan-0.4.7/src/unilib/tsc.c.gcc5 2015-06-20 19:57:35.000000000 +0200
@@ -30,7 +30,7 @@
return 1;
}
-inline tsc_t get_tsc(void) {
+tsc_t get_tsc(void) {
tsc_t j;
asm volatile ( "pause\n"
"nop\n"
@@ -52,7 +52,7 @@
* by Matteo Frigo
*/
-inline tsc_t get_tsc(void) {
+tsc_t get_tsc(void) {
uint32_t tbl, tbu0, tbu1;
asm volatile("nop");
@@ -75,7 +75,7 @@
return 1;
}
-inline tsc_t get_tsc(void) {
+tsc_t get_tsc(void) {
tsc_t j;
asm volatile (
@@ -96,7 +96,7 @@
return 1;
}
-inline tsc_t get_tsc(void) {
+tsc_t get_tsc(void) {
uint32_t j;
/*
@@ -144,7 +144,7 @@
return 0;
}
-inline tsc_t get_tsc(void) {
+tsc_t get_tsc(void) {
PANIC("Your CPU is not supported by the `tsc' delay, use -d2 or -d3 or edit your config file to use gtod or sleep");
}

4
network/unicornscan/unicornscan.SlackBuild
View file

@ -78,11 +78,11 @@ patch -p1 -b < $CWD/patches/unicornscan-0.4.7-lib64.patch
patch -p1 -b < $CWD/patches/unicornscan-0.4.7-geoip.patch
patch -p1 -b < $CWD/patches/unicornscan-0.4.7-config.patch
patch -p1 -b < $CWD/patches/unicornscan-0.4.7-man.patch
patch -p1 -b < $CWD/patches/unicornscan-0.4.7-gcc5.patch
CFLAGS="$SLKCFLAGS" \
CFLAGS="$SLKCFLAGS -D_GNU_SOURCE" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
CFLAGS=-D_GNU_SOURCE \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \