From 6d9ab12ac113f0f33289200ca3c9df24d9fc1cc2 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 23 Aug 2018 16:11:21 +0800 Subject: diffstat: 1.61 -> 1.62 Refresh avoid-check-user-break-cc.patch to fix fuzz warning. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- .../diffstat/avoid-check-user-break-cc.patch | 12 +++++++--- meta/recipes-devtools/diffstat/diffstat_1.61.bb | 28 ---------------------- meta/recipes-devtools/diffstat/diffstat_1.62.bb | 28 ++++++++++++++++++++++ 3 files changed, 37 insertions(+), 31 deletions(-) delete mode 100644 meta/recipes-devtools/diffstat/diffstat_1.61.bb create mode 100644 meta/recipes-devtools/diffstat/diffstat_1.62.bb diff --git a/meta/recipes-devtools/diffstat/diffstat/avoid-check-user-break-cc.patch b/meta/recipes-devtools/diffstat/diffstat/avoid-check-user-break-cc.patch index 2df2d00185..811faa48da 100644 --- a/meta/recipes-devtools/diffstat/diffstat/avoid-check-user-break-cc.patch +++ b/meta/recipes-devtools/diffstat/diffstat/avoid-check-user-break-cc.patch @@ -1,3 +1,8 @@ +From 1046593aacb74ff888a0d68c0ff89b20c4bc9ed4 Mon Sep 17 00:00:00 2001 +From: Kai Kang +Date: Tue, 15 May 2018 17:17:01 +0800 +Subject: [PATCH] diffstat: fix wrong evaluation of CC + Upstream-Status: Inappropriate [oe specific] m4 function CF_CC_ENV_FLAGS checks whether variable CC contains options '-I', '-U' @@ -7,15 +12,16 @@ be included in CC. And then CC will be wrongly filtered. So comment out CF_CC_ENV_FLAGS from function CF_PROG_CC. Signed-off-by: Kai Kang + --- aclocal.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aclocal.m4 b/aclocal.m4 -index 420fe83..eb73ea9 100644 +index 9281aa8..dd57b7a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 -@@ -1114,7 +1114,7 @@ CF_GCC_VERSION +@@ -1239,7 +1239,7 @@ CF_GCC_VERSION CF_ACVERSION_CHECK(2.52, [AC_PROG_CC_STDC], [CF_ANSI_CC_REQD]) @@ -23,4 +29,4 @@ index 420fe83..eb73ea9 100644 +dnl CF_CC_ENV_FLAGS ])dnl dnl --------------------------------------------------------------------------- - dnl CF_PROG_GROFF version: 2 updated: 2015/07/04 11:16:27 + dnl CF_PROG_GROFF version: 3 updated: 2018/01/07 13:16:19 diff --git a/meta/recipes-devtools/diffstat/diffstat_1.61.bb b/meta/recipes-devtools/diffstat/diffstat_1.61.bb deleted file mode 100644 index 1a76e78c15..0000000000 --- a/meta/recipes-devtools/diffstat/diffstat_1.61.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Tool to produce a statistics based on a diff" -DESCRIPTION = "diffstat reads the output of diff and displays a histogram of \ -the insertions, deletions, and modifications per-file. It is useful for \ -reviewing large, complex patch files." -HOMEPAGE = "http://invisible-island.net/diffstat/" -SECTION = "devel" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://install-sh;endline=42;md5=b3549726c1022bee09c174c72a0ca4a5" - -SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ - file://run-ptest \ - file://avoid-check-user-break-cc.patch \ -" - -SRC_URI[md5sum] = "c048a32d55d8bd6724f382baf41f325f" -SRC_URI[sha256sum] = "25359e0c27183f997b36c9202583b5dc2df390c20e22a92606af4bf7856a55ee" - -S = "${WORKDIR}/diffstat-${PV}" - -inherit autotools gettext ptest - -EXTRA_AUTORECONF += "--exclude=aclocal" - -LDFLAGS += "${TOOLCHAIN_OPTIONS}" - -do_install_ptest() { - cp -r ${S}/testing ${D}${PTEST_PATH} -} diff --git a/meta/recipes-devtools/diffstat/diffstat_1.62.bb b/meta/recipes-devtools/diffstat/diffstat_1.62.bb new file mode 100644 index 0000000000..93d77797c9 --- /dev/null +++ b/meta/recipes-devtools/diffstat/diffstat_1.62.bb @@ -0,0 +1,28 @@ +SUMMARY = "Tool to produce a statistics based on a diff" +DESCRIPTION = "diffstat reads the output of diff and displays a histogram of \ +the insertions, deletions, and modifications per-file. It is useful for \ +reviewing large, complex patch files." +HOMEPAGE = "http://invisible-island.net/diffstat/" +SECTION = "devel" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://install-sh;endline=42;md5=b3549726c1022bee09c174c72a0ca4a5" + +SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ + file://run-ptest \ + file://avoid-check-user-break-cc.patch \ +" + +SRC_URI[md5sum] = "91e106bb34cb097750db7ddc0ba1d8fc" +SRC_URI[sha256sum] = "7f09183644ed77a156b15346bbad4e89c93543e140add9dab18747e30522591f" + +S = "${WORKDIR}/diffstat-${PV}" + +inherit autotools gettext ptest + +EXTRA_AUTORECONF += "--exclude=aclocal" + +LDFLAGS += "${TOOLCHAIN_OPTIONS}" + +do_install_ptest() { + cp -r ${S}/testing ${D}${PTEST_PATH} +} -- cgit 1.2.3-korg