From 0fca8043903959cee4d732d6d7a94ff11d13dc14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Vavru=C5=A1a?= <marek.vavrusa@nic.cz>
Date: Mon, 18 May 2015 19:49:07 +0200
Subject: [PATCH] build: use hexdump instead of xxd, optional libdl
---
config.mk | 2 +-
daemon/daemon.mk | 2 +-
lib/nsrep.c | 3 +++
platform.mk | 5 ++++-
4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/config.mk b/config.mk
index 4fe3f4b2f..e8c4f46f4 100644
--- 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 6cfc44db7..8db997443 100644
--- 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 9b8fb37ed..2369a0457 100644
--- 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 8130ba6ad..e9e0d3943 100644
--- 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
--
GitLab