mirror of
https://git.yoctoproject.org/poky
synced 2026-04-18 21:32:12 +02:00
make: update 4.3 -> 4.4
Deleted patches: make/0001-makeinst-Do-not-undef-POSIX-on-clang-arm.patch (modified bit removed upstream) make/0001-src-dir.c-fix-buffer-overflow-warning.patch make/0002-w32-compat-dirent.c-follow-header.patch make/0003-posixfcn-fcntl-gnulib-make-emulated.patch (fixed upstream) make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch (code removed upstream) License-update: formatting (From OE-Core rev: fe9650c1766707067482206a3ed3288ba44c1050) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
20d0bb142d
commit
d2b7bf95fc
@@ -71,7 +71,8 @@ do_install () {
|
||||
install -m 644 ${S}/contrib/completion/git-completion.bash ${D}/${datadir}/bash-completion/completions/git
|
||||
|
||||
if [ "${@bb.utils.filter('PACKAGECONFIG', 'manpages', d)}" ]; then
|
||||
oe_runmake install-man DESTDIR="${D}"
|
||||
# Needs to be serial with make 4.4 due to https://savannah.gnu.org/bugs/index.php?63362
|
||||
make install-man DESTDIR="${D}"
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
From 86b7947156a0c33e768d0a265e38f2881a70a7e2 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 6 Mar 2020 23:19:37 -0800
|
||||
Subject: [PATCH] makeinst: Do not undef POSIX on clang/arm
|
||||
|
||||
if __arm internal compiler macro is defined then make assumes that the
|
||||
system is not posix and goes ahead and undefs POSIX, which results in
|
||||
miscompiling make with clang, since clang does define __arm unlike gcc
|
||||
which does not, but they both support posix just fine, so here check for
|
||||
compiler not being clang when __arm is defined before undefining posix
|
||||
|
||||
Fixes error like
|
||||
../make-4.3/src/job.c:507:27: error: too many arguments to function call, expected 0, have 1
|
||||
sigsetmask (siggetmask (0) & ~fatal_signal_mask)
|
||||
~~~~~~~~~~ ^
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
src/makeint.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/makeint.h b/src/makeint.h
|
||||
index c428a36..fadf963 100644
|
||||
--- a/src/makeint.h
|
||||
+++ b/src/makeint.h
|
||||
@@ -115,7 +115,7 @@ extern int errno;
|
||||
#endif
|
||||
|
||||
/* Some systems define _POSIX_VERSION but are not really POSIX.1. */
|
||||
-#if (defined (butterfly) || defined (__arm) || (defined (__mips) && defined (_SYSTYPE_SVR3)) || (defined (sequent) && defined (i386)))
|
||||
+#if (defined (butterfly) || (defined (__arm) && !defined(__clang__)) || (defined (__mips) && defined (_SYSTYPE_SVR3)) || (defined (sequent) && defined (i386)))
|
||||
# undef POSIX
|
||||
#endif
|
||||
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
From cd7091a7d88306004ca98c5dafcc40f44589b105 Mon Sep 17 00:00:00 2001
|
||||
From: Jens Rehsack <sno@netbsd.org>
|
||||
Date: Mon, 24 Feb 2020 10:52:21 +0100
|
||||
Subject: [PATCH 1/3] src/dir.c: fix buffer-overflow warning
|
||||
|
||||
Fix compiler warning:
|
||||
src/dir.c:1294:7: warning: 'strncpy' specified bound depends on the
|
||||
length of the source argument [-Wstringop-overflow=]
|
||||
|
||||
The existing code assumes `path` will never exceed `MAXPATHLEN`. Also the
|
||||
size of the buffer is increased by 1 to hold a path with the length of
|
||||
`MAXPATHLEN` and trailing `0`.
|
||||
|
||||
Signed-off-by: Jens Rehsack <sno@netbsd.org>
|
||||
---
|
||||
Upstream-Status: Pending (https://savannah.gnu.org/bugs/?57888)
|
||||
|
||||
src/dir.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/dir.c b/src/dir.c
|
||||
index 862a18e..cad4c4a 100644
|
||||
--- a/src/dir.c
|
||||
+++ b/src/dir.c
|
||||
@@ -1289,10 +1289,10 @@ local_stat (const char *path, struct stat *buf)
|
||||
if (plen > 1 && path[plen - 1] == '.'
|
||||
&& (path[plen - 2] == '/' || path[plen - 2] == '\\'))
|
||||
{
|
||||
- char parent[MAXPATHLEN];
|
||||
+ char parent[MAXPATHLEN+1];
|
||||
|
||||
- strncpy (parent, path, plen - 2);
|
||||
- parent[plen - 2] = '\0';
|
||||
+ strncpy (parent, path, MAXPATHLEN);
|
||||
+ parent[MIN(plen - 2, MAXPATHLEN)] = '\0';
|
||||
if (stat (parent, buf) < 0 || !_S_ISDIR (buf->st_mode))
|
||||
return -1;
|
||||
}
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
From fb8aaed3b040e589cd880fd714dda5ec00687217 Mon Sep 17 00:00:00 2001
|
||||
From: Jens Rehsack <sno@netbsd.org>
|
||||
Date: Mon, 24 Feb 2020 12:10:06 +0100
|
||||
Subject: [PATCH 2/2] modules: fcntl: allow being detected by importing
|
||||
projects
|
||||
|
||||
GNU project `make` relies on gnulib but provides some own compatibility
|
||||
functions - including an `fcntl`, which fails on mingw.
|
||||
The intension of gnulib is providing these functions and being wider tested,
|
||||
but silently injecting a function opens battle of compatibility layers.
|
||||
|
||||
So adding a hint into target `config.h` to allow deciding whether using
|
||||
an own compatibility implementation or not.
|
||||
|
||||
Signed-off-by: Jens Rehsack <sno@netbsd.org>
|
||||
---
|
||||
Upstream-Status: Pending
|
||||
|
||||
m4/gnulib-comp.m4 | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4
|
||||
index 3ee0811..cf75541 100644
|
||||
--- a/m4/gnulib-comp.m4
|
||||
+++ b/m4/gnulib-comp.m4
|
||||
@@ -147,6 +147,7 @@
|
||||
gl_FUNC_FCNTL
|
||||
if test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1; then
|
||||
AC_LIBOBJ([fcntl])
|
||||
+ AC_DEFINE(HAVE_GNULIB_FCNTL, 1, [Define to 1 if you have the `fcntl' function via gnulib.])
|
||||
fi
|
||||
gl_FCNTL_MODULE_INDICATOR([fcntl])
|
||||
gl_FCNTL_H
|
||||
@@ -1,36 +0,0 @@
|
||||
From 4dd8b4f43aa0078707ad9a7932f4e137bc4383ed Mon Sep 17 00:00:00 2001
|
||||
From: Jens Rehsack <sno@netbsd.org>
|
||||
Date: Mon, 24 Feb 2020 11:12:43 +0100
|
||||
Subject: [PATCH 2/3] w32: compat: dirent.c: follow header
|
||||
|
||||
src/w32/include/dirent.h completely delegates to mingw dirent implementation,
|
||||
gnulib detects it as fine and completely usable - trust in that.
|
||||
|
||||
Signed-off-by: Jens Rehsack <sno@netbsd.org>
|
||||
---
|
||||
Upstream-Status: Pending (https://savannah.gnu.org/bugs/?57888)
|
||||
|
||||
src/w32/compat/dirent.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/w32/compat/dirent.c b/src/w32/compat/dirent.c
|
||||
index b8ec615..de80f72 100644
|
||||
--- a/src/w32/compat/dirent.c
|
||||
+++ b/src/w32/compat/dirent.c
|
||||
@@ -23,7 +23,7 @@ this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
#include <stdlib.h>
|
||||
#include "dirent.h"
|
||||
|
||||
-
|
||||
+#ifndef __MINGW32__
|
||||
DIR*
|
||||
opendir(const char* pDirName)
|
||||
{
|
||||
@@ -193,3 +193,4 @@ seekdir(DIR* pDir, long nPosition)
|
||||
|
||||
return;
|
||||
}
|
||||
+#endif /* !__MINGW32__ */
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -1,79 +0,0 @@
|
||||
From 3d074c8fca5fcf3e6b83d33788f35a8f1b3a44a2 Mon Sep 17 00:00:00 2001
|
||||
From: Jens Rehsack <sno@netbsd.org>
|
||||
Date: Fri, 21 Feb 2020 19:29:49 +0100
|
||||
Subject: [PATCH 3/3] posixfcn: fcntl: gnulib > make-emulated
|
||||
|
||||
Rate the fcntl emulation from gnulib higher than the own one.
|
||||
|
||||
Signed-off-by: Jens Rehsack <sno@netbsd.org>
|
||||
---
|
||||
Upstream-Status: Pending (https://savannah.gnu.org/bugs/?57888)
|
||||
|
||||
src/output.h | 19 ++++++++++++++-----
|
||||
src/w32/compat/posixfcn.c | 2 ++
|
||||
2 files changed, 16 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/output.h b/src/output.h
|
||||
index a506505..d3ce6b7 100644
|
||||
--- a/src/output.h
|
||||
+++ b/src/output.h
|
||||
@@ -67,14 +67,21 @@ void output_dump (struct output *out);
|
||||
|
||||
# ifdef WINDOWS32
|
||||
/* For emulations in w32/compat/posixfcn.c. */
|
||||
-# define F_GETFD 1
|
||||
-# define F_SETLKW 2
|
||||
+# ifndef F_GETFD
|
||||
+# define F_GETFD 1
|
||||
+# endif
|
||||
+# ifndef F_SETLKW
|
||||
+# define F_SETLKW 2
|
||||
+# endif
|
||||
/* Implementation note: None of the values of l_type below can be zero
|
||||
-- they are compared with a static instance of the struct, so zero
|
||||
means unknown/invalid, see w32/compat/posixfcn.c. */
|
||||
-# define F_WRLCK 1
|
||||
-# define F_UNLCK 2
|
||||
-
|
||||
+# ifndef F_WRLCK
|
||||
+# define F_WRLCK 1
|
||||
+# endif
|
||||
+# ifndef F_UNLCK
|
||||
+# define F_UNLCK 2
|
||||
+# endif
|
||||
struct flock
|
||||
{
|
||||
short l_type;
|
||||
@@ -89,7 +96,9 @@ struct flock
|
||||
typedef intptr_t sync_handle_t;
|
||||
|
||||
/* Public functions emulated/provided in posixfcn.c. */
|
||||
+# ifndef HAVE_GNULIB_FCNTL
|
||||
int fcntl (intptr_t fd, int cmd, ...);
|
||||
+# endif
|
||||
intptr_t create_mutex (void);
|
||||
int same_stream (FILE *f1, FILE *f2);
|
||||
|
||||
diff --git a/src/w32/compat/posixfcn.c b/src/w32/compat/posixfcn.c
|
||||
index 975dfb7..d337b9c 100644
|
||||
--- a/src/w32/compat/posixfcn.c
|
||||
+++ b/src/w32/compat/posixfcn.c
|
||||
@@ -29,6 +29,7 @@ this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
#ifndef NO_OUTPUT_SYNC
|
||||
/* Support for OUTPUT_SYNC and related functionality. */
|
||||
|
||||
+#ifndef HAVE_GNULIB_FCNTL
|
||||
/* Emulation of fcntl that supports only F_GETFD and F_SETLKW. */
|
||||
int
|
||||
fcntl (intptr_t fd, int cmd, ...)
|
||||
@@ -142,6 +143,7 @@ fcntl (intptr_t fd, int cmd, ...)
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
+#endif /* GNULIB_TEST_FCNTL */
|
||||
|
||||
static intptr_t mutex_handle = -1;
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
||||
42
meta/recipes-devtools/make/make/sigpipe.patch
Normal file
42
meta/recipes-devtools/make/make/sigpipe.patch
Normal file
@@ -0,0 +1,42 @@
|
||||
From 92ab2e642d2c04b3dcb5a736ae6193680bfd5f74 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Smith <psmith@gnu.org>
|
||||
Date: Sun, 6 Nov 2022 15:22:02 -0500
|
||||
Subject: * src/main.c (main): [SV 63307] Handle SIGPIPE as a fatal signal
|
||||
|
||||
Always ignoring SIGPIPE is visible to child processes.
|
||||
|
||||
Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/make.git/commit/?id=92ab2e642d2c04b3dcb5a736ae6193680bfd5f74]
|
||||
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||||
---
|
||||
src/main.c | 8 +++-----
|
||||
1 file changed, 3 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/main.c b/src/main.c
|
||||
index eec9365..f2caf7a 100644
|
||||
--- a/src/main.c
|
||||
+++ b/src/main.c
|
||||
@@ -1182,11 +1182,6 @@ main (int argc, char **argv, char **envp)
|
||||
/* Useful for attaching debuggers, etc. */
|
||||
SPIN ("main-entry");
|
||||
|
||||
- /* Don't die if our stdout sends us SIGPIPE. */
|
||||
-#ifdef SIGPIPE
|
||||
- bsd_signal (SIGPIPE, SIG_IGN);
|
||||
-#endif
|
||||
-
|
||||
#ifdef HAVE_ATEXIT
|
||||
if (ANY_SET (check_io_state (), IO_STDOUT_OK))
|
||||
atexit (close_stdout);
|
||||
@@ -1265,6 +1260,9 @@ main (int argc, char **argv, char **envp)
|
||||
#ifdef SIGQUIT
|
||||
FATAL_SIG (SIGQUIT);
|
||||
#endif
|
||||
+#ifdef SIGPIPE
|
||||
+ FATAL_SIG (SIGPIPE);
|
||||
+#endif
|
||||
FATAL_SIG (SIGINT);
|
||||
FATAL_SIG (SIGTERM);
|
||||
|
||||
--
|
||||
cgit v1.1
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
LICENSE = "GPL-3.0-only"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||
require make.inc
|
||||
|
||||
SRC_URI += "\
|
||||
file://0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch \
|
||||
file://0002-modules-fcntl-allow-being-detected-by-importing-proj.patch \
|
||||
file://0001-src-dir.c-fix-buffer-overflow-warning.patch \
|
||||
file://0002-w32-compat-dirent.c-follow-header.patch \
|
||||
file://0003-posixfcn-fcntl-gnulib-make-emulated.patch \
|
||||
file://0001-makeinst-Do-not-undef-POSIX-on-clang-arm.patch \
|
||||
"
|
||||
|
||||
EXTRA_OECONF += "--without-guile"
|
||||
|
||||
SRC_URI[sha256sum] = "e05fdde47c5f7ca45cb697e973894ff4f5d79e13b750ed57d7b66d8defc78e19"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
14
meta/recipes-devtools/make/make_4.4.bb
Normal file
14
meta/recipes-devtools/make/make_4.4.bb
Normal file
@@ -0,0 +1,14 @@
|
||||
LICENSE = "GPL-3.0-only"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e"
|
||||
require make.inc
|
||||
|
||||
SRC_URI += " \
|
||||
file://0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch \
|
||||
file://sigpipe.patch \
|
||||
"
|
||||
|
||||
EXTRA_OECONF += "--without-guile"
|
||||
|
||||
SRC_URI[sha256sum] = "581f4d4e872da74b3941c874215898a7d35802f03732bdccee1d4a7979105d18"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
Reference in New Issue
Block a user