git: 4316dc94a81d - main - sysutils/triton: fix build on armv7 / powerpc*
Piotr Kubaj <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.ports |
|---|---|
| Message-ID | <[email protected]> |
The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=4316dc94a81d452f97378c598636a385a493b9ee commit 4316dc94a81d452f97378c598636a385a493b9ee Author: Piotr Kubaj <[email protected]> AuthorDate: 2026-08-12 08:13:58 +0000 Commit: Piotr Kubaj <[email protected]> CommitDate: 2026-08-12 12:54:28 +0000 sysutils/triton: fix build on armv7 / powerpc* Instead of checking the list of specific architectures, just check UINTPTR_MAX. --- sysutils/triton/Makefile | 2 -- ...tch-src_libtriton_includes_triton_tritonTypes.hpp | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/sysutils/triton/Makefile b/sysutils/triton/Makefile index f082fc9346c3..4b2134238812 100644 --- a/sysutils/triton/Makefile +++ b/sysutils/triton/Makefile @@ -12,9 +12,7 @@ WWW= https://triton.quarkslab.com/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BROKEN_armv7= src/libtriton/includes/triton/tritonToZ3.hpp:43:17: error: no type named '__uint' in namespace 'triton', see https://github.com/JonathanSalwan/Triton/issues/1214 BROKEN_i386= compilation fails: conflict of 'namespace i386' and macro '#define i386 1' -BROKEN_riscv64= src/libtriton/includes/triton/tritonToZ3.hpp:43:17: error: no type named '__uint' in namespace 'triton', see https://github.com/JonathanSalwan/Triton/issues/1214 BUILD_DEPENDS= boost-libs>0:devel/boost-libs LIB_DEPENDS= libcapstone.so:devel/capstone4 \ diff --git a/sysutils/triton/files/patch-src_libtriton_includes_triton_tritonTypes.hpp b/sysutils/triton/files/patch-src_libtriton_includes_triton_tritonTypes.hpp new file mode 100644 index 000000000000..7a439a97bb08 --- /dev/null +++ b/sysutils/triton/files/patch-src_libtriton_includes_triton_tritonTypes.hpp @@ -0,0 +1,20 @@ +--- src/libtriton/includes/triton/tritonTypes.hpp.orig 2026-08-12 07:47:18 UTC ++++ src/libtriton/includes/triton/tritonTypes.hpp +@@ -105,15 +105,13 @@ namespace triton { + //! unsigned MAX_INT 32 or 64 bits according to the CPU. + typedef std::size_t usize; + +- #if defined(__x86_64__) || defined(_M_X64) || defined(__aarch64__) ++ #if UINTPTR_MAX == UINT64_MAX + //! unsigned long long if the arch is 64-bits. + typedef unsigned long long __uint; + + //! signed long long if the arch is 64-bits. + typedef signed long long __sint; +- #endif +- +- #if defined(__i386) || defined(_M_IX86) ++ #else + //! unsigned int if the arch is 32-bits. + typedef unsigned int __uint; +