diff options
| author | David Spencer <baildon.research@googlemail.com> | 2016-01-01 14:54:12 +0000 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-01-17 09:40:16 +0700 |
| commit | 9445defe3f2e4d43ab521ed5ef77ef469bd9c08e (patch) | |
| tree | 3d3a513d70a7093d36d5815da06a3041ff6e29c5 | |
| parent | 2289b5dc210081b521c143d2612697086801bc93 (diff) | |
network/unicornscan: Fixed build with gcc-5.3.0.
Signed-off-by: David Spencer <baildon.research@googlemail.com>
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
| -rw-r--r-- | network/unicornscan/patches/unicornscan-0.4.7-gcc5.patch | 51 | ||||
| -rw-r--r-- | network/unicornscan/unicornscan.SlackBuild | 4 |
2 files changed, 53 insertions, 2 deletions
diff --git a/network/unicornscan/patches/unicornscan-0.4.7-gcc5.patch b/network/unicornscan/patches/unicornscan-0.4.7-gcc5.patch new file mode 100644 index 0000000000000..9ba28b82aef8a --- /dev/null +++ b/network/unicornscan/patches/unicornscan-0.4.7-gcc5.patch @@ -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"); + } + diff --git a/network/unicornscan/unicornscan.SlackBuild b/network/unicornscan/unicornscan.SlackBuild index 616a9308fbeb9..7c625a849028c 100644 --- a/network/unicornscan/unicornscan.SlackBuild +++ b/network/unicornscan/unicornscan.SlackBuild @@ -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 \ |