mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 07:27:45 +00:00
Ports: Upgrade CMake to 3.22.1
That's the latest release, and includes one of the patches we had - so we can drop that patch :^)
This commit is contained in:
parent
e539a1d077
commit
39b5bb4162
4 changed files with 3 additions and 52 deletions
|
@ -1,39 +0,0 @@
|
|||
From fd44bfe91d4b17c20c8028d60fe73e016879e73b Mon Sep 17 00:00:00 2001
|
||||
From: AnotherTest <ali.mpfard@gmail.com>
|
||||
Date: Fri, 12 Feb 2021 13:59:50 +0330
|
||||
Subject: [PATCH 11/11] Fixed your code rot, cmake
|
||||
|
||||
---
|
||||
Source/kwsys/ProcessUNIX.c | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/Source/kwsys/ProcessUNIX.c b/Source/kwsys/ProcessUNIX.c
|
||||
index cbf137b..65bf129 100644
|
||||
--- a/Source/kwsys/ProcessUNIX.c
|
||||
+++ b/Source/kwsys/ProcessUNIX.c
|
||||
@@ -2890,10 +2890,10 @@ static void kwsysProcessesSignalHandler(int signum
|
||||
/* Re-Install our handler. Repeat call until it is not interrupted. */
|
||||
{
|
||||
struct sigaction newSigAction;
|
||||
- struct sigaction& oldSigAction;
|
||||
+ struct sigaction* oldSigAction;
|
||||
memset(&newSigAction, 0, sizeof(struct sigaction));
|
||||
- newSigChldAction.sa_handler = kwsysProcessesSignalHandler;
|
||||
- newSigChldAction.sa_flags = SA_NOCLDSTOP;
|
||||
+ newSigAction.sa_handler = kwsysProcessesSignalHandler;
|
||||
+ newSigAction.sa_flags = SA_NOCLDSTOP;
|
||||
sigemptyset(&newSigAction.sa_mask);
|
||||
switch (signum) {
|
||||
case SIGCHLD:
|
||||
@@ -2908,7 +2908,7 @@ static void kwsysProcessesSignalHandler(int signum
|
||||
oldSigAction = &kwsysProcessesOldSigTermAction;
|
||||
break;
|
||||
default:
|
||||
- return 0;
|
||||
+ return;
|
||||
}
|
||||
while ((sigaction(signum, &newSigAction, oldSigAction) < 0) &&
|
||||
(errno == EINTR))
|
||||
--
|
||||
2.30.1
|
||||
|
|
@ -20,16 +20,6 @@ We don't support SIGINFO. This patch removes uses of SIGINFO.
|
|||
- [X] Resolves issue(s) with our side of things
|
||||
- [ ] Hack
|
||||
|
||||
## `0011-Fixed-your-code-rot-cmake.patch`
|
||||
|
||||
This purely fixes code issues with cmake. very funny patch.
|
||||
|
||||
### Status
|
||||
- [ ] Local?
|
||||
- [X] Should be merged to upstream?
|
||||
- [ ] Resolves issue(s) with our side of things
|
||||
- [ ] Hack
|
||||
|
||||
## `0012-bin-bash.patch`
|
||||
|
||||
This patch swaps out `/bin/sh` for `/bin/bash` in two scripts that need it.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue