diff options
author | John Helmert III <ajak@gentoo.org> | 2023-01-22 21:38:19 -0600 |
---|---|---|
committer | John Helmert III <ajak@gentoo.org> | 2023-01-22 22:32:34 -0600 |
commit | 309640e8da12494bdc227e238bdbd7435cb415f9 (patch) | |
tree | 52bbe1905b2b2315c7adda8652a2e39df839ebeb /dev-util/radare2/files | |
parent | media-sound/mixxx: disable building shared libs (diff) | |
download | gentoo-309640e8da12494bdc227e238bdbd7435cb415f9.tar.gz gentoo-309640e8da12494bdc227e238bdbd7435cb415f9.tar.bz2 gentoo-309640e8da12494bdc227e238bdbd7435cb415f9.zip |
dev-util/radare2: add 5.8.2
Unbundle capstone to avoid upstream requirement of capstone-5 patches
which are not shipped in Gentoo's capstone package.
Bug: https://bugs.gentoo.org/885395
Bug: https://bugs.gentoo.org/889026
Bug: https://bugs.gentoo.org/891805
Closes: https://github.com/gentoo/gentoo/pull/29223
Signed-off-by: John Helmert III <ajak@gentoo.org>
Diffstat (limited to 'dev-util/radare2/files')
-rw-r--r-- | dev-util/radare2/files/radare2-5.8.2-bundled-capstone.patch | 21 | ||||
-rw-r--r-- | dev-util/radare2/files/radare2-5.8.2-vector35.patch | 24 |
2 files changed, 45 insertions, 0 deletions
diff --git a/dev-util/radare2/files/radare2-5.8.2-bundled-capstone.patch b/dev-util/radare2/files/radare2-5.8.2-bundled-capstone.patch new file mode 100644 index 000000000000..31de9b72bb37 --- /dev/null +++ b/dev-util/radare2/files/radare2-5.8.2-bundled-capstone.patch @@ -0,0 +1,21 @@ +Need to unbundle capstone due to broken capstone-5 compatibility: + +https://github.com/radareorg/radare2/issues/21204 +https://bugs.gentoo.org/891805 + +diff --git a/shlr/Makefile b/shlr/Makefile +index 5626a061ff..5e8af3b99b 100644 +--- a/shlr/Makefile ++++ b/shlr/Makefile +@@ -225,10 +225,7 @@ capstone-sync: capstone + capstone-clean: + -$(MAKE) -C capstone clean + +-capstone: capstone-$(CS_VER).tar.gz +- tar xzvf capstone-$(CS_VER).tar.gz +- rm -rf capstone +- mv capstone-$(CS_VER) capstone ++capstone: + $(MAKE) patch-capstone + + # already implemented in capstone.sh diff --git a/dev-util/radare2/files/radare2-5.8.2-vector35.patch b/dev-util/radare2/files/radare2-5.8.2-vector35.patch new file mode 100644 index 000000000000..6b67f39b40c4 --- /dev/null +++ b/dev-util/radare2/files/radare2-5.8.2-vector35.patch @@ -0,0 +1,24 @@ +diff --git a/libr/arch/p/arm/v35/Makefile b/libr/arch/p/arm/v35/Makefile +index a7a40ddb97..1ef40746ac 100644 +--- a/libr/arch/p/arm/v35/Makefile ++++ b/libr/arch/p/arm/v35/Makefile +@@ -30,8 +30,7 @@ $(ALIBS): arch-arm64 arch-armv7 + + ## ARM64 + arch-arm64: +- git clone -q https://github.com/radareorg/vector35-arch-arm64 arch-arm64 +- cd arch-arm64 && git checkout -q radare2-wip > /dev/null && git reset --hard $(ARCH_ARM64_COMMIT) ++ cd arch-arm64 + + $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS) + rm -f arm64dis.$(EXT_AR) +@@ -40,8 +39,7 @@ $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS) + + ## ARMV7 + arch-armv7: +- git clone -q https://github.com/radareorg/vector35-arch-armv7 arch-armv7 +- cd arch-armv7 && git checkout -q radare2 > /dev/null && git reset --hard $(ARCH_ARMV7_COMMIT) ++ cd arch-armv7 + + $(V35ARMV7_HOME)/armv7dis.a armv7dis.a: $(ALIBS) + rm -f armv7dis.$(EXT_AR) |