diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/make/make.inc | 5 | ||||
-rw-r--r-- | meta/recipes-devtools/make/make/sigpipe.patch | 42 | ||||
-rw-r--r-- | meta/recipes-devtools/make/make_4.4.1.bb (renamed from meta/recipes-devtools/make/make_4.4.bb) | 3 |
3 files changed, 6 insertions, 44 deletions
diff --git a/meta/recipes-devtools/make/make.inc b/meta/recipes-devtools/make/make.inc index a0a72b6295..56b863480c 100644 --- a/meta/recipes-devtools/make/make.inc +++ b/meta/recipes-devtools/make/make.inc | |||
@@ -11,3 +11,8 @@ SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.gz \ | |||
11 | inherit autotools gettext pkgconfig texinfo | 11 | inherit autotools gettext pkgconfig texinfo |
12 | 12 | ||
13 | PROVIDES = "virtual/make" | 13 | PROVIDES = "virtual/make" |
14 | |||
15 | # Otherwise $CXX leaks into /usr/bin/make | ||
16 | do_configure:prepend() { | ||
17 | unset CXX | ||
18 | } | ||
diff --git a/meta/recipes-devtools/make/make/sigpipe.patch b/meta/recipes-devtools/make/make/sigpipe.patch deleted file mode 100644 index a7270fdbda..0000000000 --- a/meta/recipes-devtools/make/make/sigpipe.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From 92ab2e642d2c04b3dcb5a736ae6193680bfd5f74 Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Smith <psmith@gnu.org> | ||
3 | Date: Sun, 6 Nov 2022 15:22:02 -0500 | ||
4 | Subject: * src/main.c (main): [SV 63307] Handle SIGPIPE as a fatal signal | ||
5 | |||
6 | Always ignoring SIGPIPE is visible to child processes. | ||
7 | |||
8 | Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/make.git/commit/?id=92ab2e642d2c04b3dcb5a736ae6193680bfd5f74] | ||
9 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
10 | --- | ||
11 | src/main.c | 8 +++----- | ||
12 | 1 file changed, 3 insertions(+), 5 deletions(-) | ||
13 | |||
14 | diff --git a/src/main.c b/src/main.c | ||
15 | index eec9365..f2caf7a 100644 | ||
16 | --- a/src/main.c | ||
17 | +++ b/src/main.c | ||
18 | @@ -1182,11 +1182,6 @@ main (int argc, char **argv, char **envp) | ||
19 | /* Useful for attaching debuggers, etc. */ | ||
20 | SPIN ("main-entry"); | ||
21 | |||
22 | - /* Don't die if our stdout sends us SIGPIPE. */ | ||
23 | -#ifdef SIGPIPE | ||
24 | - bsd_signal (SIGPIPE, SIG_IGN); | ||
25 | -#endif | ||
26 | - | ||
27 | #ifdef HAVE_ATEXIT | ||
28 | if (ANY_SET (check_io_state (), IO_STDOUT_OK)) | ||
29 | atexit (close_stdout); | ||
30 | @@ -1265,6 +1260,9 @@ main (int argc, char **argv, char **envp) | ||
31 | #ifdef SIGQUIT | ||
32 | FATAL_SIG (SIGQUIT); | ||
33 | #endif | ||
34 | +#ifdef SIGPIPE | ||
35 | + FATAL_SIG (SIGPIPE); | ||
36 | +#endif | ||
37 | FATAL_SIG (SIGINT); | ||
38 | FATAL_SIG (SIGTERM); | ||
39 | |||
40 | -- | ||
41 | cgit v1.1 | ||
42 | |||
diff --git a/meta/recipes-devtools/make/make_4.4.bb b/meta/recipes-devtools/make/make_4.4.1.bb index 6642c708d8..c73751ddcb 100644 --- a/meta/recipes-devtools/make/make_4.4.bb +++ b/meta/recipes-devtools/make/make_4.4.1.bb | |||
@@ -4,11 +4,10 @@ require make.inc | |||
4 | 4 | ||
5 | SRC_URI += " \ | 5 | SRC_URI += " \ |
6 | file://0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch \ | 6 | file://0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch \ |
7 | file://sigpipe.patch \ | ||
8 | " | 7 | " |
9 | 8 | ||
10 | EXTRA_OECONF += "--without-guile" | 9 | EXTRA_OECONF += "--without-guile" |
11 | 10 | ||
12 | SRC_URI[sha256sum] = "581f4d4e872da74b3941c874215898a7d35802f03732bdccee1d4a7979105d18" | 11 | SRC_URI[sha256sum] = "dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3" |
13 | 12 | ||
14 | BBCLASSEXTEND = "native nativesdk" | 13 | BBCLASSEXTEND = "native nativesdk" |