diff options
| -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.15.2.bb | 3 |
2 files changed, 1 insertions, 21 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 deleted file mode 100644 index 3c7572700d..0000000000 --- a/meta/recipes-support/libcheck/libcheck/not-echo-compiler-info-to-check_stdint.h.patch +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 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.15.2.bb b/meta/recipes-support/libcheck/libcheck_0.15.2.bb index 8455f2c748..ea0453a166 100644 --- a/meta/recipes-support/libcheck/libcheck_0.15.2.bb +++ b/meta/recipes-support/libcheck/libcheck_0.15.2.bb | |||
| @@ -11,8 +11,7 @@ LICENSE = "LGPL-2.1-or-later" | |||
| 11 | LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1" | 11 | LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1" |
| 12 | 12 | ||
| 13 | SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/check-${PV}.tar.gz \ | 13 | SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/check-${PV}.tar.gz \ |
| 14 | file://automake-output.patch \ | 14 | file://automake-output.patch" |
| 15 | file://not-echo-compiler-info-to-check_stdint.h.patch" | ||
| 16 | SRC_URI[sha256sum] = "a8de4e0bacfb4d76dd1c618ded263523b53b85d92a146d8835eb1a52932fa20a" | 15 | SRC_URI[sha256sum] = "a8de4e0bacfb4d76dd1c618ded263523b53b85d92a146d8835eb1a52932fa20a" |
| 17 | GITHUB_BASE_URI = "https://github.com/libcheck/check/releases/" | 16 | GITHUB_BASE_URI = "https://github.com/libcheck/check/releases/" |
| 18 | 17 | ||
