| 1 |
commit: c126ade0c601d77c500023a3fa216c1a8c027444 |
| 2 |
Author: Peter Levine <plevine457 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun May 28 04:56:06 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 2 06:58:22 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c126ade0 |
| 7 |
|
| 8 |
net-wireless/yatebts: Fix building with GCC-6 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=594786 |
| 11 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/4785 |
| 13 |
|
| 14 |
.../yatebts/files/yatebts-5.0.0-gcc6.patch | 31 ++++++++++++++++++++++ |
| 15 |
net-wireless/yatebts/yatebts-5.0.0.ebuild | 1 + |
| 16 |
2 files changed, 32 insertions(+) |
| 17 |
|
| 18 |
diff --git a/net-wireless/yatebts/files/yatebts-5.0.0-gcc6.patch b/net-wireless/yatebts/files/yatebts-5.0.0-gcc6.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..988ca2d4f73 |
| 21 |
--- /dev/null |
| 22 |
+++ b/net-wireless/yatebts/files/yatebts-5.0.0-gcc6.patch |
| 23 |
@@ -0,0 +1,31 @@ |
| 24 |
+--- a/mbts/GPRS/MSInfo.cpp |
| 25 |
++++ b/mbts/GPRS/MSInfo.cpp |
| 26 |
+@@ -638,7 +638,7 @@ |
| 27 |
+ if (msPCHDowns.size() > 1) { |
| 28 |
+ std::ostringstream os; |
| 29 |
+ msDumpChannels(os); |
| 30 |
+- GPRSLOG(INFO,GPRS_MSG|GPRS_CHECK_OK) << "Multislot assignment for "<<this<<os; |
| 31 |
++ GPRSLOG(INFO,GPRS_MSG|GPRS_CHECK_OK) << "Multislot assignment for "<<this<<(!os.fail()); |
| 32 |
+ } |
| 33 |
+ |
| 34 |
+ } else { |
| 35 |
+--- a/mbts/SGSNGGSN/Sgsn.cpp |
| 36 |
++++ b/mbts/SGSNGGSN/Sgsn.cpp |
| 37 |
+@@ -149,7 +149,7 @@ |
| 38 |
+ clearConn(GprsConnNone,SigConnLost); |
| 39 |
+ std::ostringstream ss; |
| 40 |
+ sgsnInfoDump(this,ss); |
| 41 |
+- SGSNLOGF(INFO,GPRS_OK|GPRS_MSG,"SGSN","Removing SgsnInfo:"<<ss); |
| 42 |
++ SGSNLOGF(INFO,GPRS_OK|GPRS_MSG,"SGSN","Removing SgsnInfo:"<<(!ss.fail())); |
| 43 |
+ sSgsnInfoList.remove(this); |
| 44 |
+ GmmInfo *gmm = getGmm(); |
| 45 |
+ if (gmm && (gmm->getSI() == this)) { |
| 46 |
+@@ -252,7 +252,7 @@ |
| 47 |
+ { |
| 48 |
+ std::ostringstream ss; |
| 49 |
+ gmmInfoDump(gmm,ss,0); |
| 50 |
+- SGSNLOGF(INFO,GPRS_OK|GPRS_MSG,"SGSN","Removing gmm:"<<ss); |
| 51 |
++ SGSNLOGF(INFO,GPRS_OK|GPRS_MSG,"SGSN","Removing gmm:"<<(!ss.fail())); |
| 52 |
+ SgsnInfo *si; |
| 53 |
+ RN_FOR_ALL(SgsnInfoList_t,sSgsnInfoList,si) { |
| 54 |
+ // The second test here should be redundant. |
| 55 |
|
| 56 |
diff --git a/net-wireless/yatebts/yatebts-5.0.0.ebuild b/net-wireless/yatebts/yatebts-5.0.0.ebuild |
| 57 |
index e830454fd71..fe1cf3ba12c 100644 |
| 58 |
--- a/net-wireless/yatebts/yatebts-5.0.0.ebuild |
| 59 |
+++ b/net-wireless/yatebts/yatebts-5.0.0.ebuild |
| 60 |
@@ -37,6 +37,7 @@ src_prepare() { |
| 61 |
replace-flags -ggdb1 -g |
| 62 |
#epatch "${FILESDIR}"/${PN}-4.0.0-dont-mess-with-cflags.patch |
| 63 |
epatch "${FILESDIR}"/${PN}-sgsnggsn-inetutils-hostname-fix.diff |
| 64 |
+ epatch "${FILESDIR}"/${P}-gcc6.patch |
| 65 |
eautoreconf |
| 66 |
} |
Archives