mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-19 02:00:06 +02:00
88 lines
2.1 KiB
Plaintext
88 lines
2.1 KiB
Plaintext
From 25a8698403844bd36fc2def2e785e13955e2e01a Mon Sep 17 00:00:00 2001
|
|
From: Begasus <begasus@gmail.com>
|
|
Date: Fri, 16 Jun 2023 09:57:13 +0200
|
|
Subject: Use system header for lz4
|
|
|
|
|
|
diff --git a/libr/util/zip.c b/libr/util/zip.c
|
|
index bb1c383..83571ae 100644
|
|
--- a/libr/util/zip.c
|
|
+++ b/libr/util/zip.c
|
|
@@ -2,7 +2,7 @@
|
|
|
|
#include <r_util.h>
|
|
#include <zlib.h>
|
|
-#include "../../../shlr/lz4/lz4.h"
|
|
+#include <lz4.h>
|
|
|
|
// set a maximum output buffer of 50MB
|
|
#define MAXOUT 50000000
|
|
--
|
|
2.37.3
|
|
|
|
|
|
From f385442963b5a5ffd253ab0e22b46a8991ebadb9 Mon Sep 17 00:00:00 2001
|
|
From: Begasus <begasus@gmail.com>
|
|
Date: Fri, 16 Jun 2023 10:13:18 +0200
|
|
Subject: Fix linking with libnetwork
|
|
|
|
|
|
diff --git a/libr/io/meson.build b/libr/io/meson.build
|
|
index fa7891f..53bc8a4 100644
|
|
--- a/libr/io/meson.build
|
|
+++ b/libr/io/meson.build
|
|
@@ -72,6 +72,12 @@ r_io_deps = [
|
|
pth
|
|
]
|
|
|
|
+if host_machine.system() == 'haiku'
|
|
+ r_io_deps += [
|
|
+ cc.find_library('network')
|
|
+ ]
|
|
+endif
|
|
+
|
|
if host_machine.system() == 'linux' or host_machine.system() == 'android'
|
|
r_io_sources += [
|
|
'p/io_r2k_linux.c',
|
|
diff --git a/libr/socket/meson.build b/libr/socket/meson.build
|
|
index 135c7b5..bb2c263 100644
|
|
--- a/libr/socket/meson.build
|
|
+++ b/libr/socket/meson.build
|
|
@@ -18,6 +18,12 @@ if get_option('blob')
|
|
endif
|
|
endif
|
|
|
|
+if host_machine.system() == 'haiku'
|
|
+ r_util_deps += [
|
|
+ cc.find_library('network')
|
|
+ ]
|
|
+endif
|
|
+
|
|
if use_sys_openssl
|
|
r_util_deps += [sys_openssl]
|
|
endif
|
|
--
|
|
2.37.3
|
|
|
|
|
|
From 34a91499a9db996b9177da484b1886d5ce69ccbd Mon Sep 17 00:00:00 2001
|
|
From: Begasus <begasus@gmail.com>
|
|
Date: Fri, 16 Jun 2023 10:42:06 +0200
|
|
Subject: Haiku doesn't have ptrace
|
|
|
|
|
|
diff --git a/meson.build b/meson.build
|
|
index 654d8df..ead01b3 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -321,7 +321,7 @@ else
|
|
endif
|
|
|
|
has_debugger = get_option('debugger')
|
|
-have_ptrace = not ['windows', 'cygwin', 'sunos'].contains(host_machine.system())
|
|
+have_ptrace = not ['windows', 'cygwin', 'haiku', 'sunos'].contains(host_machine.system())
|
|
can_ptrace_wrap = ['linux'].contains(host_machine.system())
|
|
|
|
have_ptrace = have_ptrace and has_debugger
|
|
|