mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-19 18:20:07 +02:00
63 lines
1.4 KiB
Plaintext
63 lines
1.4 KiB
Plaintext
From b7dcc2d3e058c0aa9e84ce94177c2e86a69d5ce6 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 d8ebc4f..4333411 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -53,6 +53,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/testutils.c b/tests/testutils.c
|
|
index 75e3e20..bc2b539 100644
|
|
--- a/tests/testutils.c
|
|
+++ b/tests/testutils.c
|
|
@@ -50,16 +50,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];
|
|
|
|
@@ -71,7 +70,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.19.0
|
|
|