From da9fd2f0c0681ca4787cb4656cfc5acc7a60aed3 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 10 Nov 2017 19:35:47 +0100 Subject: [PATCH] radare2: bump version. --- .../radare2/patches/radare2-2.0.1.patchset | 22 +++++++++++++++++++ ...are2-1.6.0.recipe => radare2-2.0.1.recipe} | 17 +++++++++----- 2 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 dev-util/radare2/patches/radare2-2.0.1.patchset rename dev-util/radare2/{radare2-1.6.0.recipe => radare2-2.0.1.recipe} (86%) diff --git a/dev-util/radare2/patches/radare2-2.0.1.patchset b/dev-util/radare2/patches/radare2-2.0.1.patchset new file mode 100644 index 000000000..8301f3420 --- /dev/null +++ b/dev-util/radare2/patches/radare2-2.0.1.patchset @@ -0,0 +1,22 @@ +From 525e11115f4d549021fc6f69e85f85ba40cddc29 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +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 + # include +-# if !defined(__pnacl__) && !defined(__native_client__) ++# if !defined(__pnacl__) && !defined(__native_client__) && !defined(__HAIKU__) + # include + # if !defined(SYS_write) && defined(__NR_write) + # define SYS_write __NR_write +-- +2.14.2 + diff --git a/dev-util/radare2/radare2-1.6.0.recipe b/dev-util/radare2/radare2-2.0.1.recipe similarity index 86% rename from dev-util/radare2/radare2-1.6.0.recipe rename to dev-util/radare2/radare2-2.0.1.recipe index b40dba656..1980549ff 100644 --- a/dev-util/radare2/radare2-1.6.0.recipe +++ b/dev-util/radare2/radare2-2.0.1.recipe @@ -9,7 +9,8 @@ LICENSE="GNU GPL v3 GNU LGPL v3" REVISION="1" SOURCE_URI="https://github.com/radare/radare2/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="759d1c65dcd69d1189fc73e427c568ec234a7ca1958c19f5001c255dd31a3787" +CHECKSUM_SHA256="d8f7e1ab96028fc8bd62d4f92fbbe8bbf48c6cda8112e6eaec93bf5ffbbbd1dd" +PATCHES="radare2-$portVersion.patchset" ARCHITECTURES="?x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -29,9 +30,7 @@ PROVIDES=" cmd:rarun2$secondaryArchSuffix cmd:rasm2$secondaryArchSuffix cmd:rax2$secondaryArchSuffix - cmd:r2_docker$secondaryArchSuffix - cmd:r2_indent$secondaryArchSuffix - lib:libr2$secondaryArchSuffix = 1.6.0 + lib:libr2$secondaryArchSuffix = 2.0.1 lib:libr_anal$secondaryArchSuffix lib:libr_asm$secondaryArchSuffix lib:libr_bin$secondaryArchSuffix @@ -59,12 +58,14 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix lib:libcapstone$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix lib:libmagic$secondaryArchSuffix + lib:libssl$secondaryArchSuffix " PROVIDES_devel=" radare2${secondaryArchSuffix}_devel = $portVersion - devel:libr2$secondaryArchSuffix = 1.6.0 + devel:libr2$secondaryArchSuffix = 2.0.1 " REQUIRES_devel=" radare2${secondaryArchSuffix} == $portVersion base @@ -73,8 +74,10 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libcapstone$secondaryArchSuffix + devel:libcrypto$secondaryArchSuffix devel:liblua$secondaryArchSuffix devel:libmagic$secondaryArchSuffix + devel:libssl$secondaryArchSuffix devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -91,7 +94,7 @@ BUILD_PREREQUIRES=" BUILD() { runConfigure --omit-dirs docdir,datarootdir ./configure --with-sysmagic \ - --with-syscapstone + --with-syscapstone --with-openssl make $jobArgs } @@ -106,4 +109,6 @@ INSTALL() prepareInstalledDevelLib libr2 packageEntries devel $developDir + + rm $binDir/r2-docker $binDir/r2-indent }