ham/svxlink: Patched for gcc >= 6.x.
Added -fpermissive to the CXXFLAGS Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
This commit is contained in:
parent
05be5db8f9
commit
e085261e31
|
@ -0,0 +1,23 @@
|
|||
From 611cc5cc134f710f94fc8987375259bd8af34604 Mon Sep 17 00:00:00 2001
|
||||
From: Tobias Blomberg <git@sm0svx.shacknet.nu>
|
||||
Date: Mon, 19 Jun 2017 22:04:20 +0200
|
||||
Subject: [PATCH] Fix compilation problem in Async::AudioDeviceAlsa
|
||||
|
||||
- On newer compilers the compilation would fail on ambiguous call to abs
|
||||
---
|
||||
src/async/audio/AsyncAudioDeviceAlsa.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/async/audio/AsyncAudioDeviceAlsa.cpp b/src/async/audio/AsyncAudioDeviceAlsa.cpp
|
||||
index 17d255e8..15d760d5 100644
|
||||
--- a/src/async/audio/AsyncAudioDeviceAlsa.cpp
|
||||
+++ b/src/async/audio/AsyncAudioDeviceAlsa.cpp
|
||||
@@ -548,7 +548,7 @@ bool AudioDeviceAlsa::initParams(snd_pcm_t *pcm_handle)
|
||||
return false;
|
||||
}
|
||||
|
||||
- if (::abs(real_rate - sample_rate) > 100)
|
||||
+ if (::abs(static_cast<int>(real_rate) - sample_rate) > 100)
|
||||
{
|
||||
cerr << "*** ERROR: The sample rate could not be set to "
|
||||
<< sample_rate << "Hz for ALSA device \"" << dev_name << "\". "
|
|
@ -107,12 +107,15 @@ find -L . \
|
|||
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
|
||||
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
|
||||
|
||||
# From upstream
|
||||
patch -p2 < $CWD/gcc6.patch
|
||||
|
||||
mkdir -p build
|
||||
cd build
|
||||
cmake \
|
||||
$BUILD_QTEL \
|
||||
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
|
||||
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
|
||||
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -fpermissive" \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DSYSCONF_INSTALL_DIR=/etc \
|
||||
-DLOCAL_STATE_DIR=/var \
|
||||
|
|
Loading…
Reference in New Issue