mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 04:00:05 +02:00
Radare2: bump (#4839)
This commit is contained in:
extrowerk
GitHub
@@ -1,45 +0,0 @@
|
||||
From 66e947567b3d614bec48f35d5d8320f5cac6eec1 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Fri, 10 Nov 2017 19:12:01 +0100
|
||||
Subject: Haiku patch
|
||||
|
||||
|
||||
diff --git a/shlr/heap/include/r_jemalloc/internal/jemalloc_internal_decls.h b/shlr/heap/include/r_jemalloc/internal/jemalloc_internal_decls.h
|
||||
index c907d91..52dae8b 100644
|
||||
--- a/shlr/heap/include/r_jemalloc/internal/jemalloc_internal_decls.h
|
||||
+++ b/shlr/heap/include/r_jemalloc/internal/jemalloc_internal_decls.h
|
||||
@@ -9,7 +9,7 @@
|
||||
#else
|
||||
# include <sys/param.h>
|
||||
# include <sys/mman.h>
|
||||
-# if !defined(__pnacl__) && !defined(__native_client__)
|
||||
+# if !defined(__pnacl__) && !defined(__native_client__) && !defined(__HAIKU__)
|
||||
# include <sys/syscall.h>
|
||||
# if !defined(SYS_write) && defined(__NR_write)
|
||||
# define SYS_write __NR_write
|
||||
--
|
||||
2.16.4
|
||||
|
||||
|
||||
From 1b5334a37e35b13410647dc825a821ba4e07e678 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
||||
Date: Sun, 26 Aug 2018 09:28:36 +0200
|
||||
Subject: Haiku doesn't have stropts.h
|
||||
|
||||
|
||||
diff --git a/libr/io/p/io_gprobe.c b/libr/io/p/io_gprobe.c
|
||||
index 2616c8e..018e1e5 100644
|
||||
--- a/libr/io/p/io_gprobe.c
|
||||
+++ b/libr/io/p/io_gprobe.c
|
||||
@@ -23,7 +23,7 @@
|
||||
#include <tchar.h>
|
||||
#include <windows.h>
|
||||
#else
|
||||
-#if !__linux__ && !__APPLE__ && !__OpenBSD__ && !__FreeBSD__
|
||||
+#if !__linux__ && !__APPLE__ && !__OpenBSD__ && !__FreeBSD__ && !__HAIKU__
|
||||
#include <stropts.h>
|
||||
#endif
|
||||
#include <termios.h>
|
||||
--
|
||||
2.16.4
|
||||
|
||||
86
dev-util/radare2/patches/radare2-4.3.1.patchset
Normal file
86
dev-util/radare2/patches/radare2-4.3.1.patchset
Normal file
@@ -0,0 +1,86 @@
|
||||
From 6cd3c369c952c10b1eb6d571513de39747777b12 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
||||
Date: Fri, 3 Apr 2020 10:31:38 +0200
|
||||
Subject: Build fix
|
||||
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index eda093b..611a697 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -616,8 +616,11 @@ else
|
||||
if [ "$HOST_OS" = "openbsd" ]; then
|
||||
USEROSTYPE="bsd"
|
||||
else
|
||||
+if [ "$HOST_OS" = "haiku" ]; then
|
||||
+USEROSTYPE="haiku"
|
||||
+else
|
||||
if [ "$HOST_OS" = "darwin" ]; then
|
||||
-USEROSTYPE="darwin"; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi
|
||||
+USEROSTYPE="darwin"; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi; fi
|
||||
if [ "$LIBVERSION" = "xxx" ]; then
|
||||
LIBVERSION="$VERSION"; fi
|
||||
if [ "$USEROSTYPE" = "gnulinux" ]; then
|
||||
@@ -644,8 +647,12 @@ if [ "$USEROSTYPE" = "solaris" ]; then
|
||||
HAVE_PTRACE="0"
|
||||
USE_PTRACE_WRAP="0"
|
||||
else
|
||||
+if [ "$USEROSTYPE" = "haiku" ]; then
|
||||
+HAVE_PTRACE="0"
|
||||
+USE_PTRACE_WRAP="0"
|
||||
+else
|
||||
HAVE_PTRACE="1"
|
||||
-USE_PTRACE_WRAP="0"; fi; fi; fi; fi; fi
|
||||
+USE_PTRACE_WRAP="0"; fi; fi; fi; fi; fi; fi
|
||||
if [ "$DEBUGGER" = "0" ]; then
|
||||
HAVE_PTRACE="0"; fi
|
||||
if [ "$WANT_PTRACE_WRAP" = "0" ]; then
|
||||
diff --git a/libr/include/r_types.h b/libr/include/r_types.h
|
||||
index b9ac963..21daa9a 100644
|
||||
--- a/libr/include/r_types.h
|
||||
+++ b/libr/include/r_types.h
|
||||
@@ -561,11 +561,11 @@ enum {
|
||||
R_SYS_ARCH_LM32 = 0x80000000LL, // 1<<31
|
||||
};
|
||||
|
||||
-#if HAVE_CLOCK_NANOSLEEP && CLOCK_MONOTONIC && (__linux__ || (__FreeBSD__ && __FreeBSD_version >= 1101000) || (__NetBSD__ && __NetBSD_Version__ >= 700000000))
|
||||
-#define HAS_CLOCK_NANOSLEEP 1
|
||||
-#else
|
||||
+//#if HAVE_CLOCK_NANOSLEEP && CLOCK_MONOTONIC && (__linux__ || (__FreeBSD__ && __FreeBSD_version >= 1101000) || (__NetBSD__ && __NetBSD_Version__ >= 700000000))
|
||||
+//#define HAS_CLOCK_NANOSLEEP 1
|
||||
+//#else
|
||||
#define HAS_CLOCK_NANOSLEEP 0
|
||||
-#endif
|
||||
+//#endif
|
||||
|
||||
/* os */
|
||||
#if defined (__QNX__)
|
||||
diff --git a/libr/io/p/io_gprobe.c b/libr/io/p/io_gprobe.c
|
||||
index ad4017d..50b1b39 100644
|
||||
--- a/libr/io/p/io_gprobe.c
|
||||
+++ b/libr/io/p/io_gprobe.c
|
||||
@@ -26,7 +26,7 @@
|
||||
#include <windows.h>
|
||||
#else
|
||||
|
||||
-#if __linux__ || __APPLE__ || __OpenBSD__ || __FreeBSD__ || __NetBSD__ || __DragonFly__
|
||||
+#if __linux__ || __APPLE__ || __OpenBSD__ || __FreeBSD__ || __NetBSD__ || __DragonFly__ || __HAIKU__
|
||||
#include <sys/ioctl.h>
|
||||
#include <termios.h>
|
||||
#else
|
||||
diff --git a/shlr/heap/include/r_jemalloc/internal/jemalloc_internal_decls.h b/shlr/heap/include/r_jemalloc/internal/jemalloc_internal_decls.h
|
||||
index c907d91..52dae8b 100644
|
||||
--- a/shlr/heap/include/r_jemalloc/internal/jemalloc_internal_decls.h
|
||||
+++ b/shlr/heap/include/r_jemalloc/internal/jemalloc_internal_decls.h
|
||||
@@ -9,7 +9,7 @@
|
||||
#else
|
||||
# include <sys/param.h>
|
||||
# include <sys/mman.h>
|
||||
-# if !defined(__pnacl__) && !defined(__native_client__)
|
||||
+# if !defined(__pnacl__) && !defined(__native_client__) && !defined(__HAIKU__)
|
||||
# include <sys/syscall.h>
|
||||
# if !defined(SYS_write) && defined(__NR_write)
|
||||
# define SYS_write __NR_write
|
||||
--
|
||||
2.24.1
|
||||
|
||||
@@ -96,13 +96,11 @@ COPYRIGHT="2007-2016 pancake
|
||||
2010-2016 Sebastian Reichel"
|
||||
LICENSE="GNU GPL v3
|
||||
GNU LGPL v3"
|
||||
REVISION="3"
|
||||
srcGitRev="1dd1e45e465dd0b3e26c4d323546a56a9c3a8766"
|
||||
SOURCE_URI="https://github.com/radare/radare2/archive/$srcGitRev.tar.gz"
|
||||
CHECKSUM_SHA256="7162a6571c6b5b9d7190b9756f73f6f9e47703c3b79a8785c02b64af07c10314"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/radare/radare2/archive/$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="4abcb9c9dff24eab44d64d392e115ae774ab1ad90d04f2c983d96d7d7f9476aa"
|
||||
SOURCE_FILENAME="radare2-$portVersion.tar.gz"
|
||||
SOURCE_DIR="radare2-$srcGitRev"
|
||||
PATCHES="radare2-$portVersion.patchset"
|
||||
#PATCHES="radare2-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="?x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
@@ -114,7 +112,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
|
||||
commandSuffix=
|
||||
fi
|
||||
|
||||
libVersion="2.9.0"
|
||||
libVersion="4.3.1"
|
||||
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
|
||||
|
||||
PROVIDES="
|
||||
@@ -132,6 +130,7 @@ PROVIDES="
|
||||
cmd:rarun2$commandSuffix = $portVersion
|
||||
cmd:rasm2$commandSuffix = $portVersion
|
||||
cmd:rax2$commandSuffix = $portVersion
|
||||
cmd:r2p$commandSuffix = $portVersion
|
||||
lib:libr_anal$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libr_asm$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libr_bin$secondaryArchSuffix = $libVersionCompat
|
||||
@@ -148,6 +147,7 @@ PROVIDES="
|
||||
lib:libr_io$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libr_lang$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libr_magic$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libr_main$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libr_parse$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libr_reg$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libr_search$secondaryArchSuffix = $libVersionCompat
|
||||
@@ -230,28 +230,28 @@ defineDebugInfoPackage radare2$secondaryArchSuffix \
|
||||
"$commandBinDir"/rarun2 \
|
||||
"$commandBinDir"/rasm2 \
|
||||
"$commandBinDir"/rax2 \
|
||||
"$libDir"/libr_anal.so.$libVersion-git \
|
||||
"$libDir"/libr_asm.so.$libVersion-git \
|
||||
"$libDir"/libr_bin.so.$libVersion-git \
|
||||
"$libDir"/libr_bp.so.$libVersion-git \
|
||||
"$libDir"/libr_config.so.$libVersion-git \
|
||||
"$libDir"/libr_cons.so.$libVersion-git \
|
||||
"$libDir"/libr_core.so.$libVersion-git \
|
||||
"$libDir"/libr_crypto.so.$libVersion-git \
|
||||
"$libDir"/libr_debug.so.$libVersion-git \
|
||||
"$libDir"/libr_egg.so.$libVersion-git \
|
||||
"$libDir"/libr_flag.so.$libVersion-git \
|
||||
"$libDir"/libr_fs.so.$libVersion-git \
|
||||
"$libDir"/libr_hash.so.$libVersion-git \
|
||||
"$libDir"/libr_io.so.$libVersion-git \
|
||||
"$libDir"/libr_lang.so.$libVersion-git \
|
||||
"$libDir"/libr_magic.so.$libVersion-git \
|
||||
"$libDir"/libr_parse.so.$libVersion-git \
|
||||
"$libDir"/libr_reg.so.$libVersion-git \
|
||||
"$libDir"/libr_search.so.$libVersion-git \
|
||||
"$libDir"/libr_socket.so.$libVersion-git \
|
||||
"$libDir"/libr_syscall.so.$libVersion-git \
|
||||
"$libDir"/libr_util.so.$libVersion-git
|
||||
"$libDir"/libr_anal.so.$libVersion \
|
||||
"$libDir"/libr_asm.so.$libVersion \
|
||||
"$libDir"/libr_bin.so.$libVersion \
|
||||
"$libDir"/libr_bp.so.$libVersion \
|
||||
"$libDir"/libr_config.so.$libVersion \
|
||||
"$libDir"/libr_cons.so.$libVersion \
|
||||
"$libDir"/libr_core.so.$libVersion \
|
||||
"$libDir"/libr_crypto.so.$libVersion \
|
||||
"$libDir"/libr_debug.so.$libVersion \
|
||||
"$libDir"/libr_egg.so.$libVersion \
|
||||
"$libDir"/libr_flag.so.$libVersion \
|
||||
"$libDir"/libr_fs.so.$libVersion \
|
||||
"$libDir"/libr_hash.so.$libVersion \
|
||||
"$libDir"/libr_io.so.$libVersion \
|
||||
"$libDir"/libr_lang.so.$libVersion \
|
||||
"$libDir"/libr_magic.so.$libVersion \
|
||||
"$libDir"/libr_parse.so.$libVersion \
|
||||
"$libDir"/libr_reg.so.$libVersion \
|
||||
"$libDir"/libr_search.so.$libVersion \
|
||||
"$libDir"/libr_socket.so.$libVersion \
|
||||
"$libDir"/libr_syscall.so.$libVersion \
|
||||
"$libDir"/libr_util.so.$libVersion
|
||||
|
||||
BUILD()
|
||||
{
|
||||
Reference in New Issue
Block a user