74 lines
2.2 KiB
Diff
74 lines
2.2 KiB
Diff
|
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
||
|
|
Date: Thu, 9 Jul 2015 01:04:52 +0200
|
||
|
|
Subject: ebtables: remove musl build fix, it breaks ebtables on 64bit targets
|
||
|
|
|
||
|
|
diff --git a/package/network/utils/ebtables/Makefile b/package/network/utils/ebtables/Makefile
|
||
|
|
index 4f6d7f5..d3d714f 100644
|
||
|
|
--- a/package/network/utils/ebtables/Makefile
|
||
|
|
+++ b/package/network/utils/ebtables/Makefile
|
||
|
|
@@ -49,7 +49,7 @@ endef
|
||
|
|
MAKE_VARS += EXT_LIBSI="$(LIBGCC_S)"
|
||
|
|
|
||
|
|
MAKE_FLAGS += \
|
||
|
|
- CFLAGS="$(TARGET_CFLAGS)" \
|
||
|
|
+ CFLAGS="$(TARGET_CFLAGS) -g" \
|
||
|
|
LIBDIR="/usr/lib/ebtables"
|
||
|
|
|
||
|
|
define Package/ebtables/install
|
||
|
|
diff --git a/package/network/utils/ebtables/patches/100-musl_fix.patch b/package/network/utils/ebtables/patches/100-musl_fix.patch
|
||
|
|
deleted file mode 100644
|
||
|
|
index 462fea6..0000000
|
||
|
|
--- a/package/network/utils/ebtables/patches/100-musl_fix.patch
|
||
|
|
+++ /dev/null
|
||
|
|
@@ -1,50 +0,0 @@
|
||
|
|
---- a/extensions/ebt_among.c
|
||
|
|
-+++ b/extensions/ebt_among.c
|
||
|
|
-@@ -13,7 +13,6 @@
|
||
|
|
- #include <ctype.h>
|
||
|
|
- #include <unistd.h>
|
||
|
|
- #include "../include/ebtables_u.h"
|
||
|
|
--#include <netinet/ether.h>
|
||
|
|
- #include "../include/ethernetdb.h"
|
||
|
|
- #include <linux/if_ether.h>
|
||
|
|
- #include <linux/netfilter_bridge/ebt_among.h>
|
||
|
|
---- a/extensions/ebt_arpreply.c
|
||
|
|
-+++ b/extensions/ebt_arpreply.c
|
||
|
|
-@@ -12,7 +12,6 @@
|
||
|
|
- #include <string.h>
|
||
|
|
- #include <getopt.h>
|
||
|
|
- #include "../include/ebtables_u.h"
|
||
|
|
--#include <netinet/ether.h>
|
||
|
|
- #include <linux/netfilter_bridge/ebt_arpreply.h>
|
||
|
|
-
|
||
|
|
- static int mac_supplied;
|
||
|
|
---- a/extensions/ebt_nat.c
|
||
|
|
-+++ b/extensions/ebt_nat.c
|
||
|
|
-@@ -11,7 +11,6 @@
|
||
|
|
- #include <string.h>
|
||
|
|
- #include <getopt.h>
|
||
|
|
- #include "../include/ebtables_u.h"
|
||
|
|
--#include <netinet/ether.h>
|
||
|
|
- #include <linux/netfilter_bridge/ebt_nat.h>
|
||
|
|
-
|
||
|
|
- static int to_source_supplied, to_dest_supplied;
|
||
|
|
---- a/useful_functions.c
|
||
|
|
-+++ b/useful_functions.c
|
||
|
|
-@@ -25,7 +25,6 @@
|
||
|
|
- #include "include/ebtables_u.h"
|
||
|
|
- #include "include/ethernetdb.h"
|
||
|
|
- #include <stdio.h>
|
||
|
|
--#include <netinet/ether.h>
|
||
|
|
- #include <string.h>
|
||
|
|
- #include <stdlib.h>
|
||
|
|
- #include <getopt.h>
|
||
|
|
---- a/include/ebtables_u.h
|
||
|
|
-+++ b/include/ebtables_u.h
|
||
|
|
-@@ -23,6 +23,7 @@
|
||
|
|
-
|
||
|
|
- #ifndef EBTABLES_U_H
|
||
|
|
- #define EBTABLES_U_H
|
||
|
|
-+#include <sys/types.h>
|
||
|
|
- #include <netinet/in.h>
|
||
|
|
- #include <linux/netfilter_bridge/ebtables.h>
|
||
|
|
- #include <linux/netfilter/x_tables.h>
|