diff options
| author | Diane Bruce <db@FreeBSD.org> | 2015-05-01 16:25:48 +0000 |
|---|---|---|
| committer | Diane Bruce <db@FreeBSD.org> | 2015-05-01 16:25:48 +0000 |
| commit | 9a22bc193369ce59ea5818dc1f3bc5cdeeec6bc8 (patch) | |
| tree | 31074f49f2dcf142a7d25d341ed84e7d07387ff6 /comms/linrad/files/patch-configure | |
| parent | - Update test suite depends (diff) | |
Fix linrad on latest gcc
I checked linrad upstream, and they still haven't fixed these two bugs. I am surprised they haven't been reported yet. Without these fixes, linrad cannot be built with gcc5.
the menu.c patch simply reverses the order of the condition. One must check the bounds constraint first! It's a pretty dumb mistake but I've seen this kind before.
The second one fails because -Werror is set. This took me a while because I couldn't figure out the relationship between ADCHANS and rxchan. In any case, setting 4 locations per channel did indeed allow the array to be big enough. (at first I thought the loop was running too high, but I finally determined the array was too small).
These were found on DragonFly that uses gcc5.
This patch has not been tested on FreeBSD but I can't how it could possibly fail.
It would be good if the ham@ maintainer reports the issue upstream.
Updated patch files using make makepatch
PR: ports/199737
Submitted by: marino
Diffstat (limited to 'comms/linrad/files/patch-configure')
| -rw-r--r-- | comms/linrad/files/patch-configure | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/comms/linrad/files/patch-configure b/comms/linrad/files/patch-configure index 37a10b484c00..3d381ec8bb26 100644 --- a/comms/linrad/files/patch-configure +++ b/comms/linrad/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2014-11-04 02:25:00.000000000 -0800 -+++ configure 2014-12-09 10:52:10.000000000 -0800 -@@ -1832,11 +1832,6 @@ +--- configure.orig 2014-11-04 10:25:00 UTC ++++ configure +@@ -1832,11 +1832,6 @@ fi ELF32="" ELF64="" if test ${OS} != "Darwin"; then @@ -12,7 +12,7 @@ ELF64="-felf64" LIBEXT="so" S_OS_TYPE="OS_LINUX" -@@ -1853,7 +1848,9 @@ +@@ -1853,7 +1848,9 @@ else fi # Find out whether we have gcc @@ -23,7 +23,7 @@ # Extract the first word of "${CC} ", so it can be a program name with args. set dummy ${CC} ; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -@@ -4025,6 +4022,9 @@ +@@ -4025,6 +4022,9 @@ ALSA32_OK="0" ALSA64_OK="0" ALSA32_INSTALLED="0" ALSA64_INSTALLED="0" @@ -33,7 +33,7 @@ ALSA32_LD="libasound.${LIBEXT}" X=`./libfind1 libasound.${LIBEXT}` ALSA32_INC=`./libfind2 1 "$X"` -@@ -4090,6 +4090,7 @@ +@@ -4090,6 +4090,7 @@ if test "$ALSA64_OK" = "1"; then ALSA64_LD="" fi fi |