From 655b2c6626425fa89ef0ecf39f9e588f678aca40 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 12 Oct 2017 21:07:34 +0200
Subject: Apply patch from 1.3.0.


diff --git a/Makefile b/Makefile
index e1e138a..aafda0a 100644
--- a/Makefile
+++ b/Makefile
@@ -49,6 +49,15 @@ SHAREDLIB_CFLAGS  = -fPIC
 SHAREDLIB_LDFLAGS = -fPIC -shared -Wl,--version-script=$(LIBFDT_version) -Wl,-soname,
 endif
 
+ifeq ($(HOSTOS),haiku)
+INSTALL = /bin/install
+endif
+
+ifneq ($(HOSTOS),haiku)
+LIBDL = -ldl
+endif
+
+
 #
 # Overall rules
 #
diff --git a/tests/Makefile.tests b/tests/Makefile.tests
index 2258135..b97970f 100644
--- a/tests/Makefile.tests
+++ b/tests/Makefile.tests
@@ -56,7 +56,7 @@ $(LIB_TESTS): %: $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_archive)
 
 $(DL_LIB_TESTS): %: %.o $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_archive)
 	@$(VECHO) LD [libdl] $@
-	$(LINK.c) -o $@ $^ -ldl
+	$(LINK.c) -o $@ $^ $(LIBDL)
 
 $(LIBTREE_TESTS): %: $(TESTS_PREFIX)testutils.o $(TESTS_PREFIX)trees.o \
 		util.o $(LIBFDT_archive)
diff --git a/tests/testutils.c b/tests/testutils.c
index 521f4f1..5fa757f 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -45,16 +45,15 @@ static void sigint_handler(int signum, siginfo_t *si, void *uc)
 {
 	cleanup();
 	fprintf(stderr, "%s: %s (pid=%d)\n", test_name,
-		strsignal(signum), getpid());
+		strsignal(signum), (int)getpid());
 	exit(RC_BUG);
 }
 
 void test_init(int argc, char *argv[])
 {
 	int err;
-	struct sigaction sa_int = {
-		.sa_sigaction = sigint_handler,
-	};
+	struct sigaction sa_int = { };
+	sa_int.sa_sigaction = sigint_handler;
 
 	test_name = argv[0];
 
@@ -66,7 +65,7 @@ void test_init(int argc, char *argv[])
 		verbose_test = 0;
 
 	verbose_printf("Starting testcase \"%s\", pid %d\n",
-		       test_name, getpid());
+		       test_name, (int)getpid());
 }
 
 void check_mem_rsv(void *fdt, int n, uint64_t addr, uint64_t size)
-- 
2.14.2