| 1 |
commit: fda0cd2b9a57ef7e4d8e6e44bbf1d675ccb0feea |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 6 09:09:53 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 6 09:12:35 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fda0cd2b |
| 7 |
|
| 8 |
net-analyzer/sancp: fix musl build |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/832421 |
| 11 |
CLoses: https://bugs.gentoo.org/714662 |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
net-analyzer/sancp/Manifest | 1 + |
| 15 |
net-analyzer/sancp/sancp-1.6.1-r7.ebuild | 24 ++++++++++-------------- |
| 16 |
2 files changed, 11 insertions(+), 14 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-analyzer/sancp/Manifest b/net-analyzer/sancp/Manifest |
| 19 |
index 5334b6da520f..82188b274820 100644 |
| 20 |
--- a/net-analyzer/sancp/Manifest |
| 21 |
+++ b/net-analyzer/sancp/Manifest |
| 22 |
@@ -1,3 +1,4 @@ |
| 23 |
+DIST sancp-1.6.1-musl.patch.bz2 7013 BLAKE2B a54c3a3c45b1029a95451a21de2b42497434dff6715cb173db5f04293740f3e03869900e23c571dae97a563a9b7fdce76c4295f3267857a77a074a65e79f3b53 SHA512 3310577acef1d16b87b51924ed6fbb82b491afc5646555667fcd2430aef1b0dd5f0ee510c6356eebd32402b79eb8e9f5032955b5194517acc0c055da8dd74fc2 |
| 24 |
DIST sancp-1.6.1.fix200511.a.patch 662 BLAKE2B d3d5114662f3904db4052d581b3a95f07f5a492b439958bd64149ca6f9aaf48f2d2d9cf2094500b9ab829b3a06358180893637ed6d3f502ef46f87dfe8527ccc SHA512 87662d9ea863a3a2468b7b64c81a191d34c81348eab9374245a73d3ed63cf2f25df54561f092f3713d516d9cc4eb553d4d7286fd920676a301e61669a023142e |
| 25 |
DIST sancp-1.6.1.fix200511.b.patch 870 BLAKE2B 18ad38c37f11aa1c4804400db5475323db25e0c135d3478e9c81af3a0a3885f397521fdf9b58825216fdd16ec2e2616584f3dc9e175e76d64c7125a767b2c029 SHA512 a54bbec1ce3799f83c006f7375297bafee85b12a90361f1f5dbbf46c936193c7e0f1196483a2bdf560019e93ceffe9129b3c01322eedc397e5dfa3a1a6b76b81 |
| 26 |
DIST sancp-1.6.1.fix200601.c.patch 3578 BLAKE2B 7c7e5ef0e1967d41f731d3c79f4273a4ebfc922159ada1940ba4635f6f82e63ed55faeffe53636d2c8fd96d57e1516211fff8852c73876d019fc13d59f4ace9d SHA512 3d15028d33e7dbddc74d8c6eefac6d66e357f024dca15afdfb8156b0cf969ab093c26baa43ebf7c1ac88f4275ef4bdc91c1cc69c5aa7b439a042ed966edea30f |
| 27 |
|
| 28 |
diff --git a/net-analyzer/sancp/sancp-1.6.1-r7.ebuild b/net-analyzer/sancp/sancp-1.6.1-r7.ebuild |
| 29 |
index e18588995cbb..f3ea7b0a3461 100644 |
| 30 |
--- a/net-analyzer/sancp/sancp-1.6.1-r7.ebuild |
| 31 |
+++ b/net-analyzer/sancp/sancp-1.6.1-r7.ebuild |
| 32 |
@@ -1,4 +1,4 @@ |
| 33 |
-# Copyright 1999-2021 Gentoo Authors |
| 34 |
+# Copyright 1999-2022 Gentoo Authors |
| 35 |
# Distributed under the terms of the GNU General Public License v2 |
| 36 |
|
| 37 |
EAPI=7 |
| 38 |
@@ -7,15 +7,14 @@ inherit toolchain-funcs |
| 39 |
|
| 40 |
DESCRIPTION="collect network traffic statistics and store them in pcap format" |
| 41 |
HOMEPAGE="https://sourceforge.net/projects/sancp/" |
| 42 |
-SRC_URI=" |
| 43 |
- http://www.metre.net/files/${P}.tar.gz |
| 44 |
+SRC_URI="http://www.metre.net/files/${P}.tar.gz |
| 45 |
http://sancp.sourceforge.net/${PN}-1.6.1.fix200511.a.patch |
| 46 |
http://sancp.sourceforge.net/${PN}-1.6.1.fix200511.b.patch |
| 47 |
http://sancp.sourceforge.net/${PN}-1.6.1.fix200601.c.patch |
| 48 |
http://sancp.sourceforge.net/${PN}-1.6.1.fix200606.d.patch |
| 49 |
-" |
| 50 |
+ https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.6.1-musl.patch.bz2" |
| 51 |
|
| 52 |
-LICENSE="QPL-1.0 GPL-2" # GPL-2 for init script |
| 53 |
+LICENSE="QPL-1.0 GPL-2" # GPL-2 for init script |
| 54 |
SLOT="0" |
| 55 |
KEYWORDS="~amd64 ~x86" |
| 56 |
IUSE="sguil" |
| 57 |
@@ -27,20 +26,17 @@ RDEPEND=" |
| 58 |
DEPEND="${RDEPEND}" |
| 59 |
|
| 60 |
PATCHES=( |
| 61 |
+ "${DISTDIR}"/${PN}-1.6.1.fix200511.a.patch |
| 62 |
+ "${DISTDIR}"/${PN}-1.6.1.fix200511.b.patch |
| 63 |
+ # bug 138337 |
| 64 |
+ "${DISTDIR}"/${PN}-1.6.1.fix200601.c.patch |
| 65 |
+ "${DISTDIR}"/${PN}-1.6.1.fix200606.d.patch |
| 66 |
"${FILESDIR}"/${PN}-1.6.1-compiler.patch |
| 67 |
"${FILESDIR}"/${PN}-1.6.1-gcc6.patch |
| 68 |
"${FILESDIR}"/${PN}-1.6.1-extern.patch |
| 69 |
+ "${WORKDIR}"/${PN}-1.6.1-musl.patch |
| 70 |
) |
| 71 |
|
| 72 |
-src_prepare() { |
| 73 |
- eapply "${DISTDIR}"/${PN}-1.6.1.fix200511.a.patch |
| 74 |
- eapply "${DISTDIR}"/${PN}-1.6.1.fix200511.b.patch |
| 75 |
- # bug 138337 |
| 76 |
- eapply "${DISTDIR}"/${PN}-1.6.1.fix200601.c.patch |
| 77 |
- eapply "${DISTDIR}"/${PN}-1.6.1.fix200606.d.patch |
| 78 |
- default |
| 79 |
-} |
| 80 |
- |
| 81 |
src_compile() { |
| 82 |
tc-export CC CXX |
| 83 |
emake CFLAGS="${CXXFLAGS}" |
Archives