diff options
author | Kai Kang <kai.kang@windriver.com> | 2018-10-03 00:27:13 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-04 14:21:41 +0100 |
commit | 0ceeae575bf5eb3dfe4544bc83320f852777789e (patch) | |
tree | 003b1b6745334f7034c3541a409c9dc54fae161e /meta/recipes-support/libcheck/libcheck | |
parent | 077532d20d4b14f4ccd354cb80d5f8bd5a749ab6 (diff) | |
download | poky-0ceeae575bf5eb3dfe4544bc83320f852777789e.tar.gz |
libcheck: avoid multilib install file conflict
The first line of output of '$CC --version' is written to check_stdint.h
as a comment line. It causes multilib install file conflict.
Do not echo compiler version info to check_stdint.h to fix the issue.
(From OE-Core rev: f9db6ac8044495f9299fb0e962d3d6838bbce08f)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libcheck/libcheck')
-rw-r--r-- | meta/recipes-support/libcheck/libcheck/not-echo-compiler-info-to-check_stdint.h.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/meta/recipes-support/libcheck/libcheck/not-echo-compiler-info-to-check_stdint.h.patch b/meta/recipes-support/libcheck/libcheck/not-echo-compiler-info-to-check_stdint.h.patch new file mode 100644 index 0000000000..3c7572700d --- /dev/null +++ b/meta/recipes-support/libcheck/libcheck/not-echo-compiler-info-to-check_stdint.h.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | Do not echo compiler info in a comment line to check_stdint.h which causes | ||
2 | multilib install file conflict. | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | |||
6 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
7 | |||
8 | diff --git a/m4/ax_create_stdint_h.m4 b/m4/ax_create_stdint_h.m4 | ||
9 | index 33a21f8..eacc37a 100644 | ||
10 | --- a/m4/ax_create_stdint_h.m4 | ||
11 | +++ b/m4/ax_create_stdint_h.m4 | ||
12 | @@ -272,7 +272,6 @@ echo "#ifndef" $_ac_stdint_h >$ac_stdint | ||
13 | echo "#define" $_ac_stdint_h "1" >>$ac_stdint | ||
14 | echo "#ifndef" _GENERATED_STDINT_H >>$ac_stdint | ||
15 | echo "#define" _GENERATED_STDINT_H '"'$PACKAGE $VERSION'"' >>$ac_stdint | ||
16 | -echo "/* generated $ac_cv_stdint_message */" >>$ac_stdint | ||
17 | if test "_$ac_cv_header_stdint_t" != "_" ; then | ||
18 | echo "#define _STDINT_HAVE_STDINT_H" "1" >>$ac_stdint | ||
19 | echo "#include <stdint.h>" >>$ac_stdint | ||