build: use hexdump instead of xxd, optional libdl

diff --git a/config.mk b/config.mk
index 4fe3f4b2f3c6757a487cc8b5b023eb0b92ec1e83..e8c4f46f4c51a47909fe6b3fcb9d26a6b951f962 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -16,6 +16,6 @@ CFLAGS        += -std=c99 -D_GNU_SOURCE -Wall -fPIC -I$(abspath .) -I$(abspath lib/gene
 CFLAGS  += -DPACKAGE_VERSION="\"$(MAJOR).$(MINOR)\"" -DPREFIX="\"$(PREFIX)\"" -DMODULEDIR="\"$(MODULEDIR)\""
 RM     := rm -f
 LN      := ln -s
-XXD     ?= xxd
+XXD     ?= hexdump -v -e '/1 "0x%02X, " " "'
 INSTALL := install
 PYTHON  := python

diff --git a/daemon/daemon.mk b/daemon/daemon.mk
index 6cfc44db759404730adeea3525f0c5972835873f..8db997443e71027c3a57682332decc3432774ac0 100644 (file)
--- a/daemon/daemon.mk
+++ b/daemon/daemon.mk
@@ -10,7 +10,7 @@ kresolved_SOURCES := \
 # Embed resources
 daemon/engine.o: daemon/lua/sandbox.inc daemon/lua/config.inc
 %.inc: %.lua
-       @$(call quiet,XXD,$<) -i - < $< > $@
+       @$(call quiet,XXD,$<) $< > $@
 
 # Dependencies
 kresolved_DEPEND := $(libkresolve)

diff --git a/lib/nsrep.c b/lib/nsrep.c
index 9b8fb37ed3534196d8baa8d009ebfd97d7656d21..2369a0457e13c2b4d9a57f7ac1ec51a6d7ab4e86 100644 (file)
--- a/lib/nsrep.c
+++ b/lib/nsrep.c
@@ -15,6 +15,9 @@
  */
 
 #include <assert.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
 
 #include "lib/nsrep.h"
 #include "lib/defines.h"

diff --git a/platform.mk b/platform.mk
index 8130ba6adb5599c2c5e20cba9e014f6d171283b8..e9e0d39439fa69d8f99aee6ecaacafe2a6f94da3 100644 (file)
--- a/platform.mk
+++ b/platform.mk
@@ -22,7 +22,10 @@ else
         MODTYPE := dynamiclib
     else
         PLATFORM := POSIX
-        LDFLAGS += -pthread -ldl
+        LDFLAGS += -pthread
+        ifeq (,$(findstring BSD,$(UNAME)))
+            LDFLAGS += -ldl
+        endif
     endif
 endif