diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/libcheck/libcheck/not-echo-compiler-info-to-check_stdint.h.patch | 19 | ||||
-rw-r--r-- | meta/recipes-support/libcheck/libcheck_0.12.0.bb | 3 |
2 files changed, 21 insertions, 1 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 | ||
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" | |||
5 | LICENSE = "LGPLv2.1+" | 5 | LICENSE = "LGPLv2.1+" |
6 | LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1" | 6 | LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1" |
7 | 7 | ||
8 | SRC_URI = "https://github.com/${BPN}/check/releases/download/${PV}/check-${PV}.tar.gz" | 8 | SRC_URI = "https://github.com/${BPN}/check/releases/download/${PV}/check-${PV}.tar.gz \ |
9 | file://not-echo-compiler-info-to-check_stdint.h.patch" | ||
9 | SRC_URI[md5sum] = "31b17c6075820a434119592941186f70" | 10 | SRC_URI[md5sum] = "31b17c6075820a434119592941186f70" |
10 | SRC_URI[sha256sum] = "464201098bee00e90f5c4bdfa94a5d3ead8d641f9025b560a27755a83b824234" | 11 | SRC_URI[sha256sum] = "464201098bee00e90f5c4bdfa94a5d3ead8d641f9025b560a27755a83b824234" |
11 | UPSTREAM_CHECK_URI = "https://github.com/libcheck/check/releases/" | 12 | UPSTREAM_CHECK_URI = "https://github.com/libcheck/check/releases/" |