summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Levine <plevine457@gmail.com>2017-05-28 00:56:06 -0400
committerDavid Seifert <soap@gentoo.org>2017-06-02 08:58:22 +0200
commitc126ade0c601d77c500023a3fa216c1a8c027444 (patch)
tree41386ee4f67aa97866fd762b804ed64039ef7abe /net-wireless
parentnet-p2p/litecoind: Fix building with GCC-6 (diff)
downloadgentoo-c126ade0c601d77c500023a3fa216c1a8c027444.tar.gz
gentoo-c126ade0c601d77c500023a3fa216c1a8c027444.tar.bz2
gentoo-c126ade0c601d77c500023a3fa216c1a8c027444.zip
net-wireless/yatebts: Fix building with GCC-6
Bug: https://bugs.gentoo.org/show_bug.cgi?id=594786 Package-Manager: Portage-2.3.6, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/4785
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/yatebts/files/yatebts-5.0.0-gcc6.patch31
-rw-r--r--net-wireless/yatebts/yatebts-5.0.0.ebuild1
2 files changed, 32 insertions, 0 deletions
diff --git a/net-wireless/yatebts/files/yatebts-5.0.0-gcc6.patch b/net-wireless/yatebts/files/yatebts-5.0.0-gcc6.patch
new file mode 100644
index 00000000000..988ca2d4f73
--- /dev/null
+++ b/net-wireless/yatebts/files/yatebts-5.0.0-gcc6.patch
@@ -0,0 +1,31 @@
+--- a/mbts/GPRS/MSInfo.cpp
++++ b/mbts/GPRS/MSInfo.cpp
+@@ -638,7 +638,7 @@
+ if (msPCHDowns.size() > 1) {
+ std::ostringstream os;
+ msDumpChannels(os);
+- GPRSLOG(INFO,GPRS_MSG|GPRS_CHECK_OK) << "Multislot assignment for "<<this<<os;
++ GPRSLOG(INFO,GPRS_MSG|GPRS_CHECK_OK) << "Multislot assignment for "<<this<<(!os.fail());
+ }
+
+ } else {
+--- a/mbts/SGSNGGSN/Sgsn.cpp
++++ b/mbts/SGSNGGSN/Sgsn.cpp
+@@ -149,7 +149,7 @@
+ clearConn(GprsConnNone,SigConnLost);
+ std::ostringstream ss;
+ sgsnInfoDump(this,ss);
+- SGSNLOGF(INFO,GPRS_OK|GPRS_MSG,"SGSN","Removing SgsnInfo:"<<ss);
++ SGSNLOGF(INFO,GPRS_OK|GPRS_MSG,"SGSN","Removing SgsnInfo:"<<(!ss.fail()));
+ sSgsnInfoList.remove(this);
+ GmmInfo *gmm = getGmm();
+ if (gmm && (gmm->getSI() == this)) {
+@@ -252,7 +252,7 @@
+ {
+ std::ostringstream ss;
+ gmmInfoDump(gmm,ss,0);
+- SGSNLOGF(INFO,GPRS_OK|GPRS_MSG,"SGSN","Removing gmm:"<<ss);
++ SGSNLOGF(INFO,GPRS_OK|GPRS_MSG,"SGSN","Removing gmm:"<<(!ss.fail()));
+ SgsnInfo *si;
+ RN_FOR_ALL(SgsnInfoList_t,sSgsnInfoList,si) {
+ // The second test here should be redundant.
diff --git a/net-wireless/yatebts/yatebts-5.0.0.ebuild b/net-wireless/yatebts/yatebts-5.0.0.ebuild
index e830454fd71..fe1cf3ba12c 100644
--- a/net-wireless/yatebts/yatebts-5.0.0.ebuild
+++ b/net-wireless/yatebts/yatebts-5.0.0.ebuild
@@ -37,6 +37,7 @@ src_prepare() {
replace-flags -ggdb1 -g
#epatch "${FILESDIR}"/${PN}-4.0.0-dont-mess-with-cflags.patch
epatch "${FILESDIR}"/${PN}-sgsnggsn-inetutils-hostname-fix.diff
+ epatch "${FILESDIR}"/${P}-gcc6.patch
eautoreconf
}