linux-libc-headers: Fix build failure with fixed input and output files instead of pipe

This is an amendment for
2322dc4 "linux-libc-headers: Fix build failure by using fixed temporary file instead of pipe"
which moves just the temporary input file from /tmp to build directory. But the
build directory may not in the same file system with the output file,
/dev/null, either and thus make it possible to trigger that bug, 67f846b, in
binutil v2.31.

This patch puts both the input and output files into build directory for good.

(From OE-Core rev: 0d836013e43f29cb7d4a1f8bb9ef04dd8d9132df)

Signed-off-by: He Zhe <zhe.he@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
He Zhe
2019-01-07 09:33:45 -05:00
committed by Richard Purdie
parent adc37721a8
commit 7abac94d38
2 changed files with 11 additions and 13 deletions

View File

@@ -1,7 +1,7 @@
From 3bbea65e11918f8753e8006a2198b999cdb0af58 Mon Sep 17 00:00:00 2001
From 694eba7bb974f6b8bd308804cb24350150108b2b Mon Sep 17 00:00:00 2001
From: He Zhe <zhe.he@windriver.com>
Date: Wed, 21 Nov 2018 15:12:43 +0800
Subject: [PATCH] scripts: Use fixed temporary file instead of pipe for
Subject: [PATCH] scripts: Use fixed input and output files instead of pipe for
here-doc
There was a bug of "as" in binutils that when it checks if the input file and
@@ -40,31 +40,29 @@ Upstream-Status: Inappropriate [A work around for binutils v2.31]
Signed-off-by: He Zhe <zhe.he@windriver.com>
---
scripts/gcc-goto.sh | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
scripts/gcc-goto.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/scripts/gcc-goto.sh b/scripts/gcc-goto.sh
index 083c526..0aaf1b4 100755
index 083c526..8dfac55 100755
--- a/scripts/gcc-goto.sh
+++ b/scripts/gcc-goto.sh
@@ -3,7 +3,9 @@
@@ -3,7 +3,7 @@
# Test for gcc 'asm goto' support
# Copyright (C) 2010, Jason Baron <jbaron@redhat.com>
-cat << "END" | $@ -x c - -c -o /dev/null >/dev/null 2>&1 && echo "y"
+TMPFILE=`mktemp -p .`
+
+cat << "END" > ${TMPFILE}
+cat << "END" > ./input
int main(void)
{
#if defined(__arm__) || defined(__aarch64__)
@@ -20,3 +22,6 @@ entry:
@@ -20,3 +20,6 @@ entry:
return 0;
}
END
+
+$@ -x c ${TMPFILE} -c -o /dev/null && echo "y"
+rm ${TMPFILE}
+$@ -x c ./input -c -o ./output && echo "y"
+rm ./input ./output
--
2.7.4

View File

@@ -10,7 +10,7 @@ SRC_URI_append_libc-musl = "\
"
SRC_URI_append = "\
file://0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch \
file://0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch \
"
SRC_URI[md5sum] = "bee5fe53ee1c3142b8f0c12c0d3348f9"