From 40c0dd67dddd958084dc8fc63109410d73e63205 Mon Sep 17 00:00:00 2001 From: Lucas CHOLLET Date: Sat, 1 Jul 2023 22:11:27 -0400 Subject: [PATCH] Ports/backward-cpp: Update to the latest available commit backward-cpp 1.6 wasn't compatible with the latest version of binutils (which we are using). This is now fixed upstream, but it forces us to build with the latest commit and not a published version. --- Ports/AvailablePorts.md | 2 +- Ports/backward-cpp/package.sh | 5 ++-- ...-to-be-Linux-with-some-modifications.patch | 27 ++++++++++--------- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 0774f3771f..60ab641c20 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -13,7 +13,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n | [`Another-World`](Another-World/) | Another World Bytecode Interpreter | | https://github.com/fabiensanglard/Another-World-Bytecode-Interpreter | | [`aria2`](aria2/) | aria2 | 1.36.0 | https://aria2.github.io | | [`awk`](awk/) | The One True Awk | 20220122 | https://github.com/onetrueawk/awk | -| [`backward-cpp`](backward-cpp/) | Backward-cpp | 1.6 | https://github.com/bombela/backward-cpp | +| [`backward-cpp`](backward-cpp/) | Backward-cpp | 65a769f | https://github.com/bombela/backward-cpp | | [`bash`](bash/) | GNU Bash | 5.2.15 | https://www.gnu.org/software/bash/ | | [`bass`](bass/) | Beneath a Steel Sky | cd-1.2 | https://www.scummvm.org/games | | [`bc`](bc/) | bc | 6.5.0 | https://github.com/gavinhoward/bc | diff --git a/Ports/backward-cpp/package.sh b/Ports/backward-cpp/package.sh index bb15e045bb..6632ad2079 100755 --- a/Ports/backward-cpp/package.sh +++ b/Ports/backward-cpp/package.sh @@ -1,7 +1,8 @@ #!/usr/bin/env -S bash ../.port_include.sh port='backward-cpp' -version='1.6' -files="https://github.com/bombela/backward-cpp/archive/refs/tags/v${version}.tar.gz backward-cpp-${version}.tar.gz c654d0923d43f1cea23d086729673498e4741fb2457e806cfaeaea7b20c97c10" +version='65a769f' +files="https://github.com/bombela/backward-cpp/tarball/65a769ffe77cf9d759d801bc792ac56af8e911a3 backward-cpp-${version}.tar.gz 233271162bf09ce7c41026416e5d6f59a66f42f83c3ea370f110980ac219144a" +workdir="bombela-backward-cpp-${version}" auth_type='sha256' useconfigure='true' configopts=( diff --git a/Ports/backward-cpp/patches/0002-backward-Pretend-to-be-Linux-with-some-modifications.patch b/Ports/backward-cpp/patches/0002-backward-Pretend-to-be-Linux-with-some-modifications.patch index de5abcb105..9d075cef7e 100644 --- a/Ports/backward-cpp/patches/0002-backward-Pretend-to-be-Linux-with-some-modifications.patch +++ b/Ports/backward-cpp/patches/0002-backward-Pretend-to-be-Linux-with-some-modifications.patch @@ -4,11 +4,11 @@ Date: Sat, 11 Mar 2023 15:17:34 -0700 Subject: [PATCH] backward: Pretend to be Linux, with some modifications --- - backward.hpp | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) + backward.hpp | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/backward.hpp b/backward.hpp -index ac7ad51738f8d13f07a6162d421b191696c9f84a..03f4f7546c4e59f3b17529c61a0f387e09e3731c 100644 +index 670aa45853997c515974bb9411d7a9e72aeeee78..25e70cc6d0d1e508ac42e63ea3fa8b56992cfb27 100644 --- a/backward.hpp +++ b/backward.hpp @@ -63,7 +63,7 @@ @@ -20,7 +20,7 @@ index ac7ad51738f8d13f07a6162d421b191696c9f84a..03f4f7546c4e59f3b17529c61a0f387e #define BACKWARD_SYSTEM_LINUX #elif defined(__APPLE__) #define BACKWARD_SYSTEM_DARWIN -@@ -213,7 +213,9 @@ +@@ -219,7 +219,9 @@ #endif #include #include @@ -28,9 +28,9 @@ index ac7ad51738f8d13f07a6162d421b191696c9f84a..03f4f7546c4e59f3b17529c61a0f387e #include +#endif #include - - #if BACKWARD_HAS_BFD == 1 -@@ -737,7 +739,7 @@ public: + #ifndef _GNU_SOURCE + #define _GNU_SOURCE +@@ -742,7 +744,7 @@ public: protected: void load_thread_info() { #ifdef BACKWARD_SYSTEM_LINUX @@ -39,7 +39,7 @@ index ac7ad51738f8d13f07a6162d421b191696c9f84a..03f4f7546c4e59f3b17529c61a0f387e _thread_id = static_cast(syscall(SYS_gettid)); #else _thread_id = static_cast(gettid()); -@@ -4140,7 +4142,9 @@ public: +@@ -4171,7 +4173,9 @@ public: SIGBUS, // Bus error (bad memory access) SIGFPE, // Floating point exception SIGILL, // Illegal Instruction @@ -49,7 +49,7 @@ index ac7ad51738f8d13f07a6162d421b191696c9f84a..03f4f7546c4e59f3b17529c61a0f387e SIGQUIT, // Quit from keyboard SIGSEGV, // Invalid memory reference SIGSYS, // Bad argument to routine (SVr4) -@@ -4231,6 +4235,8 @@ public: +@@ -4262,6 +4266,8 @@ public: error_addr = reinterpret_cast(uctx->uc_mcontext->__ss.__rip); #elif defined(__APPLE__) error_addr = reinterpret_cast(uctx->uc_mcontext->__ss.__eip); @@ -58,12 +58,13 @@ index ac7ad51738f8d13f07a6162d421b191696c9f84a..03f4f7546c4e59f3b17529c61a0f387e #else #warning ":/ sorry, ain't know no nothing none not of your architecture!" #endif -@@ -4245,7 +4251,7 @@ public: - printer.address = true; +@@ -4277,7 +4283,8 @@ public: printer.print(st, stderr); --#if _XOPEN_SOURCE >= 700 || _POSIX_C_SOURCE >= 200809L -+#if (_XOPEN_SOURCE >= 700 || _POSIX_C_SOURCE >= 200809L) && !defined(__serenity__) + #if (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 700) || \ +- (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200809L) ++ (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200809L) && \ ++ !defined(__serenity__) psiginfo(info, nullptr); #else (void)info;