From f9db6ac8044495f9299fb0e962d3d6838bbce08f Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Wed, 3 Oct 2018 00:27:13 +0800 Subject: 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. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- .../not-echo-compiler-info-to-check_stdint.h.patch | 19 +++++++++++++++++++ meta/recipes-support/libcheck/libcheck_0.12.0.bb | 3 ++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/libcheck/libcheck/not-echo-compiler-info-to-check_stdint.h.patch (limited to 'meta/recipes-support/libcheck') 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 @@ +Do not echo compiler info in a comment line to check_stdint.h which causes +multilib install file conflict. + +Upstream-Status: Pending + +Signed-off-by: Kai Kang + +diff --git a/m4/ax_create_stdint_h.m4 b/m4/ax_create_stdint_h.m4 +index 33a21f8..eacc37a 100644 +--- a/m4/ax_create_stdint_h.m4 ++++ b/m4/ax_create_stdint_h.m4 +@@ -272,7 +272,6 @@ echo "#ifndef" $_ac_stdint_h >$ac_stdint + echo "#define" $_ac_stdint_h "1" >>$ac_stdint + echo "#ifndef" _GENERATED_STDINT_H >>$ac_stdint + echo "#define" _GENERATED_STDINT_H '"'$PACKAGE $VERSION'"' >>$ac_stdint +-echo "/* generated $ac_cv_stdint_message */" >>$ac_stdint + if test "_$ac_cv_header_stdint_t" != "_" ; then + echo "#define _STDINT_HAVE_STDINT_H" "1" >>$ac_stdint + echo "#include " >>$ac_stdint diff --git a/meta/recipes-support/libcheck/libcheck_0.12.0.bb b/meta/recipes-support/libcheck/libcheck_0.12.0.bb index e646d43968..3bb48a75a3 100644 --- a/meta/recipes-support/libcheck/libcheck_0.12.0.bb +++ b/meta/recipes-support/libcheck/libcheck_0.12.0.bb @@ -5,7 +5,8 @@ SECTION = "devel" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1" -SRC_URI = "https://github.com/${BPN}/check/releases/download/${PV}/check-${PV}.tar.gz" +SRC_URI = "https://github.com/${BPN}/check/releases/download/${PV}/check-${PV}.tar.gz \ + file://not-echo-compiler-info-to-check_stdint.h.patch" SRC_URI[md5sum] = "31b17c6075820a434119592941186f70" SRC_URI[sha256sum] = "464201098bee00e90f5c4bdfa94a5d3ead8d641f9025b560a27755a83b824234" UPSTREAM_CHECK_URI = "https://github.com/libcheck/check/releases/" -- cgit 1.2.3-korg