| 1 |
commit: 2d27cdd864df239dad22df5f2c2711fdb06579f2 |
| 2 |
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 16 20:31:42 2018 +0000 |
| 4 |
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 16 20:31:59 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d27cdd8 |
| 7 |
|
| 8 |
net-wireless/yatebts: fix CFLAGS mangling |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 11 |
|
| 12 |
.../yatebts/files/yatebts-6.0.0-dont-mess-with-cflags.patch | 12 ++++++++++++ |
| 13 |
net-wireless/yatebts/yatebts-6.0.0.ebuild | 12 +++++++----- |
| 14 |
net-wireless/yatebts/yatebts-9999.ebuild | 12 +++++++----- |
| 15 |
3 files changed, 26 insertions(+), 10 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..c6827eb9095 |
| 20 |
--- /dev/null |
| 21 |
+++ b/net-wireless/yatebts/files/yatebts-6.0.0-dont-mess-with-cflags.patch |
| 22 |
@@ -0,0 +1,12 @@ |
| 23 |
+--- configure.ac 2017-09-07 10:21:08.000000000 -0400 |
| 24 |
++++ configure-sane.ac 2018-02-16 15:26:43.884257256 -0500 |
| 25 |
+@@ -38,9 +38,6 @@ |
| 26 |
+ AC_PROG_CC |
| 27 |
+ AC_PROG_AWK |
| 28 |
+ |
| 29 |
+-# Delete -g as we handle debug info at build time |
| 30 |
+-CFLAGS=`echo "$CFLAGS" | sed 's/\(^\| \+\)-g[[0-9]]*//' 2>/dev/null` |
| 31 |
+- |
| 32 |
+ # Helper to check by pkgconfig including local paths |
| 33 |
+ function pkgconfig_check() |
| 34 |
+ { |
| 35 |
|
| 36 |
diff --git a/net-wireless/yatebts/yatebts-6.0.0.ebuild b/net-wireless/yatebts/yatebts-6.0.0.ebuild |
| 37 |
index 3a932f78012..8dd83f84e58 100644 |
| 38 |
--- a/net-wireless/yatebts/yatebts-6.0.0.ebuild |
| 39 |
+++ b/net-wireless/yatebts/yatebts-6.0.0.ebuild |
| 40 |
@@ -1,7 +1,7 @@ |
| 41 |
# Copyright 1999-2018 Gentoo Foundation |
| 42 |
# Distributed under the terms of the GNU General Public License v2 |
| 43 |
|
| 44 |
-EAPI=5 |
| 45 |
+EAPI=6 |
| 46 |
|
| 47 |
inherit eutils autotools |
| 48 |
|
| 49 |
@@ -34,15 +34,17 @@ src_prepare() { |
| 50 |
#we need more patches or configure flags because things install in really wrong places per FHS |
| 51 |
epatch "${FILESDIR}"/${PN}-sgsnggsn-inetutils-hostname-fix.diff |
| 52 |
epatch "${FILESDIR}"/${PN}-5.0.0-gcc6.patch |
| 53 |
+ epatch "${FILESDIR}"/${P}-dont-mess-with-cflags.patch |
| 54 |
+ default |
| 55 |
eautoreconf |
| 56 |
} |
| 57 |
|
| 58 |
+# $(use_enable rad1) \ |
| 59 |
+# $(use_enable usrp1) \ |
| 60 |
+# $(use_enable uhd) \ |
| 61 |
+# $(use_enable bladerf) \ |
| 62 |
src_configure() { |
| 63 |
econf \ |
| 64 |
- $(use_enable rad1) \ |
| 65 |
- $(use_enable usrp1) \ |
| 66 |
- $(use_enable uhd) \ |
| 67 |
- $(use_enable bladerf) \ |
| 68 |
$(use_enable cpu_flags_x86_sse3 sse3) \ |
| 69 |
$(use_enable cpu_flags_x86_sse4_1 sse41) |
| 70 |
|
| 71 |
|
| 72 |
diff --git a/net-wireless/yatebts/yatebts-9999.ebuild b/net-wireless/yatebts/yatebts-9999.ebuild |
| 73 |
index 3a932f78012..8dd83f84e58 100644 |
| 74 |
--- a/net-wireless/yatebts/yatebts-9999.ebuild |
| 75 |
+++ b/net-wireless/yatebts/yatebts-9999.ebuild |
| 76 |
@@ -1,7 +1,7 @@ |
| 77 |
# Copyright 1999-2018 Gentoo Foundation |
| 78 |
# Distributed under the terms of the GNU General Public License v2 |
| 79 |
|
| 80 |
-EAPI=5 |
| 81 |
+EAPI=6 |
| 82 |
|
| 83 |
inherit eutils autotools |
| 84 |
|
| 85 |
@@ -34,15 +34,17 @@ src_prepare() { |
| 86 |
#we need more patches or configure flags because things install in really wrong places per FHS |
| 87 |
epatch "${FILESDIR}"/${PN}-sgsnggsn-inetutils-hostname-fix.diff |
| 88 |
epatch "${FILESDIR}"/${PN}-5.0.0-gcc6.patch |
| 89 |
+ epatch "${FILESDIR}"/${P}-dont-mess-with-cflags.patch |
| 90 |
+ default |
| 91 |
eautoreconf |
| 92 |
} |
| 93 |
|
| 94 |
+# $(use_enable rad1) \ |
| 95 |
+# $(use_enable usrp1) \ |
| 96 |
+# $(use_enable uhd) \ |
| 97 |
+# $(use_enable bladerf) \ |
| 98 |
src_configure() { |
| 99 |
econf \ |
| 100 |
- $(use_enable rad1) \ |
| 101 |
- $(use_enable usrp1) \ |
| 102 |
- $(use_enable uhd) \ |
| 103 |
- $(use_enable bladerf) \ |
| 104 |
$(use_enable cpu_flags_x86_sse3 sse3) \ |
| 105 |
$(use_enable cpu_flags_x86_sse4_1 sse41) |
Archives