From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnout Vandecappelle Date: Sun, 14 Aug 2016 23:22:33 +0200 Subject: [Buildroot] [PATCH 3/8] package/aircrack-ng: drop a musl-compatibility patch In-Reply-To: References: Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net On 12-08-16 22:49, Yann E. MORIN wrote: > We now always have a sys/cdefs.h, so we can drop this patch. > > Signed-off-by: "Yann E. MORIN" > Cc: Thomas Petazzoni Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Regards, Arnout > --- > package/aircrack-ng/0004-fix-musl-build.patch | 53 --------------------------- > 1 file changed, 53 deletions(-) > delete mode 100644 package/aircrack-ng/0004-fix-musl-build.patch > > diff --git a/package/aircrack-ng/0004-fix-musl-build.patch b/package/aircrack-ng/0004-fix-musl-build.patch > deleted file mode 100644 > index cc093d3..0000000 > --- a/package/aircrack-ng/0004-fix-musl-build.patch > +++ /dev/null > @@ -1,53 +0,0 @@ > -From da6e87670ad4639371da056f9e36201a9236dfa2 Mon Sep 17 00:00:00 2001 > -From: Romain Naour > -Date: Wed, 29 Jul 2015 19:38:46 +0200 > -Subject: [PATCH] fix musl build > - > -aircrack-ng doesn't build with a musl toolchain due to > -cdefs.h internal glibc header being used in internal > -ethernet.h [1]. > - > -[1] http://wiki.musl-libc.org/wiki/FAQ > - > -Signed-off-by: Romain Naour > ---- > - src/include/ethernet.h | 20 +++++++++++--------- > - 1 file changed, 11 insertions(+), 9 deletions(-) > - > -diff --git a/src/include/ethernet.h b/src/include/ethernet.h > -index 72d5e81..e9d9236 100644 > ---- a/src/include/ethernet.h > -+++ b/src/include/ethernet.h > -@@ -389,18 +389,20 @@ void ether_vlan_mtap(struct bpf_if *, struct mbuf *, > - > - #else /* _KERNEL */ > - > --#include > -- > - /* > - * Ethernet address conversion/parsing routines. > - */ > --__BEGIN_DECLS > --struct ether_addr *ether_aton(const char *); > --int ether_hostton(const char *, struct ether_addr *); > --int ether_line(const char *, struct ether_addr *, char *); > --char *ether_ntoa(const struct ether_addr *); > --int ether_ntohost(char *, const struct ether_addr *); > --__END_DECLS > -+#ifdef __cplusplus > -+extern "C" { > -+#endif > -+ struct ether_addr *ether_aton(const char *); > -+ int ether_hostton(const char *, struct ether_addr *); > -+ int ether_line(const char *, struct ether_addr *, char *); > -+ char *ether_ntoa(const struct ether_addr *); > -+ int ether_ntohost(char *, const struct ether_addr *); > -+#ifdef __cplusplus > -+} > -+#endif > - > - #endif /* !_KERNEL */ > - > --- > -2.4.3 > - > -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF