mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 13:09:50 +00:00
make: Fix build on arm/clang
clang defines __arm which is interpreted as non-posix by make build system but thats not correct when using clang so patch addresses that (From OE-Core rev: e225278a8a894389add56d14908398c14512f6c9) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -0,0 +1,38 @@
|
|||||||
|
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
|
||||||
|
|
||||||
@@ -8,6 +8,7 @@ SRC_URI += "\
|
|||||||
file://0001-src-dir.c-fix-buffer-overflow-warning.patch \
|
file://0001-src-dir.c-fix-buffer-overflow-warning.patch \
|
||||||
file://0002-w32-compat-dirent.c-follow-header.patch \
|
file://0002-w32-compat-dirent.c-follow-header.patch \
|
||||||
file://0003-posixfcn-fcntl-gnulib-make-emulated.patch \
|
file://0003-posixfcn-fcntl-gnulib-make-emulated.patch \
|
||||||
|
file://0001-makeinst-Do-not-undef-POSIX-on-clang-arm.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
EXTRA_OECONF += "--without-guile"
|
EXTRA_OECONF += "--without-guile"
|
||||||
|
|||||||
Reference in New Issue
Block a user