Skip to contentSkip to conversation

solve musl build problem

PATCH In review Brendan Heading 2 participants 6 messages Sep 3, 2015 netfilter

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 solve musl build problem

musl does not include <sys/queue.h> which is a series of macros implementing linked lists etc. The suggestion on the part of the musl devs is to include a copy in the source tree. The header here is lifted from glibc but appears to be 3-clause BSD licensed.

---
 src/lookup_kas.c |   2 +-
 src/main.c       |   2 +-
 src/queue.h      | 574 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 576 insertions(+), 2 deletions(-)
 create mode 100644 src/queue.h
src/lookup_kas.c +1 -1
index 09fad98..8dfad5f 100644
@@ -30,8 +30,8 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/queue.h>
 
+#include "queue.h"
 #include "lookup.h"
 
 struct symbol_entry {
src/main.c +1 -1
index caccaf1..6386b00 100644
@@ -31,7 +31,6 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/socket.h>
-#include <sys/queue.h>
 #include <readline/readline.h>
 #include <readline/history.h>
 #include <asm/types.h>
@@ -39,6 +38,7 @@
 #include <netlink/genl/genl.h>
 #include <netlink/genl/ctrl.h>
 
+#include "queue.h"
 #include "net_dropmon.h"
 #include "lookup.h"
 
src/queue.h new file +574 -0

574 lines not on this page · raw message

Signature · 1 line
2.4.3
#1 lore raw

src/lookup_kas.c

Quoted 17 lines · Brendan Heading

musl does not include <sys/queue.h> which is a series of macros implementing linked lists etc. The suggestion on the part of the musl devs is to include a copy in the source tree. The header here is lifted from glibc but appears to be 3-clause BSD licensed.

---
 src/lookup_kas.c |   2 +-
 src/main.c       |   2 +-
 src/queue.h      | 574 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 576 insertions(+), 2 deletions(-)
 create mode 100644 src/queue.h
src/lookup_kas.c +0 -0
index 09fad98..8dfad5f 100644

Where is this file in our netfilter tree?

#2 lore raw

Sorry Pablo - wrong mailing list! Please ignore.

regards

Brendan

Quoted 20 lines · Pablo Neira Ayuso

src/lookup_kas.c

Quoted 17 lines · Brendan Heading

musl does not include <sys/queue.h> which is a series of macros implementing linked lists etc. The suggestion on the part of the musl devs is to include a copy in the source tree. The header here is lifted from glibc but appears to be 3-clause BSD licensed.

---
 src/lookup_kas.c |   2 +-
 src/main.c       |   2 +-
 src/queue.h      | 574 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 576 insertions(+), 2 deletions(-)
 create mode 100644 src/queue.h
src/lookup_kas.c +0 -0
index 09fad98..8dfad5f 100644

Where is this file in our netfilter tree?

#3 lore raw
Quoted 1 line · Brendan Heading

Sorry Pablo - wrong mailing list! Please ignore.

Pablo - the patch is intended for ebtables.

is this the right place for patches or do they need to go somewhere else ?

regards

Brendan

#4 lore raw
Quoted 4 lines · Brendan Heading
Quoted 1 line · Brendan Heading

Sorry Pablo - wrong mailing list! Please ignore.

Pablo - the patch is intended for ebtables.

.../ebtables$ ls

ChangeLog         ebtables-restore.c     getethertype.c
communication.c   ebtables-restore.o     getethertype.o
communication.o   ebtables-save          include
COPYING           ebtables.spec          INSTALL
ebtables          ebtables-standalone.c  libebtc.c
ebtables.8        ebtables-standalone.o  libebtc.o
ebtables.c        ebtables.sysv          libebtc.so
ebtables-config   ebtablesu.c            Makefile
ebtablesd.c       ethertypes             THANKS
ebtables.o        examples               useful_functions.c
ebtables-restore  extensions             useful_functions.o

../ebtables$ find . | grep src

Hm, I see no 'src' directory under ebtables.

#5 lore raw
Quoted 1 line

Hm, I see no 'src' directory under ebtables.

Apologies Pablo, wires seriously crossed here. I sent the wrong patch.

Please ignore, I'll sort this out after I've had more coffee :)

regards

Brendan