* [gentoo-commits] repo/gentoo:master commit in: net-wireless/yatebts/files/, net-wireless/yatebts/
@ 2018-02-16 20:32 Richard Farina
0 siblings, 0 replies; 2+ messages in thread
From: Richard Farina @ 2018-02-16 20:32 UTC (permalink / raw
To: gentoo-commits
commit: 2d27cdd864df239dad22df5f2c2711fdb06579f2
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 16 20:31:42 2018 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Feb 16 20:31:59 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d27cdd8
net-wireless/yatebts: fix CFLAGS mangling
Package-Manager: Portage-2.3.24, Repoman-2.3.6
.../yatebts/files/yatebts-6.0.0-dont-mess-with-cflags.patch | 12 ++++++++++++
net-wireless/yatebts/yatebts-6.0.0.ebuild | 12 +++++++-----
net-wireless/yatebts/yatebts-9999.ebuild | 12 +++++++-----
3 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/net-wireless/yatebts/files/yatebts-6.0.0-dont-mess-with-cflags.patch b/net-wireless/yatebts/files/yatebts-6.0.0-dont-mess-with-cflags.patch
new file mode 100644
index 00000000000..c6827eb9095
--- /dev/null
+++ b/net-wireless/yatebts/files/yatebts-6.0.0-dont-mess-with-cflags.patch
@@ -0,0 +1,12 @@
+--- configure.ac 2017-09-07 10:21:08.000000000 -0400
++++ configure-sane.ac 2018-02-16 15:26:43.884257256 -0500
+@@ -38,9 +38,6 @@
+ AC_PROG_CC
+ AC_PROG_AWK
+
+-# Delete -g as we handle debug info at build time
+-CFLAGS=`echo "$CFLAGS" | sed 's/\(^\| \+\)-g[[0-9]]*//' 2>/dev/null`
+-
+ # Helper to check by pkgconfig including local paths
+ function pkgconfig_check()
+ {
diff --git a/net-wireless/yatebts/yatebts-6.0.0.ebuild b/net-wireless/yatebts/yatebts-6.0.0.ebuild
index 3a932f78012..8dd83f84e58 100644
--- a/net-wireless/yatebts/yatebts-6.0.0.ebuild
+++ b/net-wireless/yatebts/yatebts-6.0.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
inherit eutils autotools
@@ -34,15 +34,17 @@ src_prepare() {
#we need more patches or configure flags because things install in really wrong places per FHS
epatch "${FILESDIR}"/${PN}-sgsnggsn-inetutils-hostname-fix.diff
epatch "${FILESDIR}"/${PN}-5.0.0-gcc6.patch
+ epatch "${FILESDIR}"/${P}-dont-mess-with-cflags.patch
+ default
eautoreconf
}
+# $(use_enable rad1) \
+# $(use_enable usrp1) \
+# $(use_enable uhd) \
+# $(use_enable bladerf) \
src_configure() {
econf \
- $(use_enable rad1) \
- $(use_enable usrp1) \
- $(use_enable uhd) \
- $(use_enable bladerf) \
$(use_enable cpu_flags_x86_sse3 sse3) \
$(use_enable cpu_flags_x86_sse4_1 sse41)
diff --git a/net-wireless/yatebts/yatebts-9999.ebuild b/net-wireless/yatebts/yatebts-9999.ebuild
index 3a932f78012..8dd83f84e58 100644
--- a/net-wireless/yatebts/yatebts-9999.ebuild
+++ b/net-wireless/yatebts/yatebts-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
inherit eutils autotools
@@ -34,15 +34,17 @@ src_prepare() {
#we need more patches or configure flags because things install in really wrong places per FHS
epatch "${FILESDIR}"/${PN}-sgsnggsn-inetutils-hostname-fix.diff
epatch "${FILESDIR}"/${PN}-5.0.0-gcc6.patch
+ epatch "${FILESDIR}"/${P}-dont-mess-with-cflags.patch
+ default
eautoreconf
}
+# $(use_enable rad1) \
+# $(use_enable usrp1) \
+# $(use_enable uhd) \
+# $(use_enable bladerf) \
src_configure() {
econf \
- $(use_enable rad1) \
- $(use_enable usrp1) \
- $(use_enable uhd) \
- $(use_enable bladerf) \
$(use_enable cpu_flags_x86_sse3 sse3) \
$(use_enable cpu_flags_x86_sse4_1 sse41)
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/yatebts/files/, net-wireless/yatebts/
@ 2017-06-02 7:04 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2017-06-02 7:04 UTC (permalink / raw
To: gentoo-commits
commit: c126ade0c601d77c500023a3fa216c1a8c027444
Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sun May 28 04:56:06 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Jun 2 06:58:22 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c126ade0
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
.../yatebts/files/yatebts-5.0.0-gcc6.patch | 31 ++++++++++++++++++++++
net-wireless/yatebts/yatebts-5.0.0.ebuild | 1 +
2 files changed, 32 insertions(+)
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
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-02-16 20:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-16 20:32 [gentoo-commits] repo/gentoo:master commit in: net-wireless/yatebts/files/, net-wireless/yatebts/ Richard Farina
-- strict thread matches above, loose matches on Subject: below --
2017-06-02 7:04 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox