diff options
author | Tudor Florea <tudor.florea@enea.com> | 2014-10-16 03:05:19 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2014-10-16 03:05:19 +0200 |
commit | c527fd1f14c27855a37f2e8ac5346ce8d940ced2 (patch) | |
tree | bb002c1fdf011c41dbd2f0927bed23ecb5f83c97 /meta/recipes-devtools/diffstat | |
download | poky-daisy-140929.tar.gz |
initial commit for Enea Linux 4.0-140929daisy-140929
Migrated from the internal git server on the daisy-enea-point-release branch
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-devtools/diffstat')
4 files changed, 102 insertions, 0 deletions
diff --git a/meta/recipes-devtools/diffstat/diffstat/aclocal.patch b/meta/recipes-devtools/diffstat/diffstat/aclocal.patch new file mode 100644 index 0000000000..ff18f1b31d --- /dev/null +++ b/meta/recipes-devtools/diffstat/diffstat/aclocal.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | Use the correct macro name (AC_AUTOCONF_VERSION) in the CF_ACVERSION_CHECK macro. | ||
2 | The original macro name (AC_ACVERSION) leads to this error: | ||
3 | |||
4 | | autoreconf: running: aclocal --system-acdir=/poky/buildnew/tmp/work/i586-poky-linux/diffstat/1.57-r0/build/aclocal-copy/ --automake-acdir=/poky/buildnew/tmp/sysroots/x86_64-linux/usr/share/aclocal-1.12 --force | ||
5 | | aclocal: warning: autoconf input should be named 'configure.ac', not 'configure.in' | ||
6 | | configure.in:9: error: m4_defn: undefined macro: AC_ACVERSION | ||
7 | | acinclude.m4:989: CF_PROG_CC is expanded from... | ||
8 | | configure.in:9: the top level | ||
9 | | autom4te: m4 failed with exit status: 1 | ||
10 | |||
11 | Upstream-Status: Inappropriate [embedded specific] | ||
12 | Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com> | ||
13 | |||
14 | Index: diffstat-1.58/aclocal.m4 | ||
15 | =================================================================== | ||
16 | --- diffstat-1.58.orig/aclocal.m4 2013-10-29 01:43:23.000000000 +0200 | ||
17 | +++ diffstat-1.58/aclocal.m4 2013-11-04 11:22:53.461562567 +0200 | ||
18 | @@ -13,16 +13,16 @@ | ||
19 | dnl Conditionally generate script according to whether we're using a given autoconf. | ||
20 | dnl | ||
21 | dnl $1 = version to compare against | ||
22 | -dnl $2 = code to use if AC_ACVERSION is at least as high as $1. | ||
23 | -dnl $3 = code to use if AC_ACVERSION is older than $1. | ||
24 | +dnl $2 = code to use if AC_AUTOCONF_VERSION is at least as high as $1. | ||
25 | +dnl $3 = code to use if AC_AUTOCONF_VERSION is older than $1. | ||
26 | define([CF_ACVERSION_CHECK], | ||
27 | [ | ||
28 | ifdef([AC_ACVERSION], ,[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])dnl | ||
29 | ifdef([m4_version_compare], | ||
30 | -[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])], | ||
31 | +[m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_VERSION]), [$1]), -1, [$3], [$2])], | ||
32 | [CF_ACVERSION_COMPARE( | ||
33 | AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])), | ||
34 | -AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)), AC_ACVERSION, [$2], [$3])])])dnl | ||
35 | +AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_AUTOCONF_VERSION)), AC_AUTOCONF_VERSION, [$2], [$3])])])dnl | ||
36 | dnl --------------------------------------------------------------------------- | ||
37 | dnl CF_ACVERSION_COMPARE version: 3 updated: 2012/10/03 18:39:53 | ||
38 | dnl -------------------- | ||
diff --git a/meta/recipes-devtools/diffstat/diffstat/dirfix.patch b/meta/recipes-devtools/diffstat/diffstat/dirfix.patch new file mode 100644 index 0000000000..6685056333 --- /dev/null +++ b/meta/recipes-devtools/diffstat/diffstat/dirfix.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | $libdir isn't used by the Makefile at all apart from in this mkdir. | ||
2 | This will be used without any DESTDIR so if your libdir is a different | ||
3 | layout to the bulid system it will cause a failure. E.g: | ||
4 | |||
5 | Build system has /usr/lib only | ||
6 | libdir = /usr/lib64 for the target | ||
7 | Results in "mkdir: cannot create directory `/usr/lib64': Permission denied" | ||
8 | |||
9 | Since the directory is never used, we can just remove the mkdir. | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | RP 23/9/2011 | ||
14 | |||
15 | Index: diffstat-1.54/makefile.in | ||
16 | =================================================================== | ||
17 | --- diffstat-1.54.orig/makefile.in 2011-09-22 19:13:11.330158571 +0100 | ||
18 | +++ diffstat-1.54/makefile.in 2011-09-22 19:13:35.610158363 +0100 | ||
19 | @@ -79,7 +79,7 @@ | ||
20 | $(INSTALL_DATA) $(srcdir)/$(THIS).1 $(man1dir)/$(THIS).$(manext) | ||
21 | |||
22 | installdirs : | ||
23 | - mkdir -p $(BINDIR) $(libdir) $(man1dir) | ||
24 | + mkdir -p $(BINDIR) $(man1dir) | ||
25 | |||
26 | uninstall : | ||
27 | rm -f $(BINDIR)/$(PROG) $(man1dir)/$(THIS).$(manext) | ||
diff --git a/meta/recipes-devtools/diffstat/diffstat/run-ptest b/meta/recipes-devtools/diffstat/diffstat/run-ptest new file mode 100644 index 0000000000..a936b3d3fe --- /dev/null +++ b/meta/recipes-devtools/diffstat/diffstat/run-ptest | |||
@@ -0,0 +1,5 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | ./testing/run_test.sh ./testing/case*.pat |sed \ | ||
4 | -e 's|** ok|PASS|' \ | ||
5 | -e 's|?? fail|FAIL|' | ||
diff --git a/meta/recipes-devtools/diffstat/diffstat_1.58.bb b/meta/recipes-devtools/diffstat/diffstat_1.58.bb new file mode 100644 index 0000000000..204473a04a --- /dev/null +++ b/meta/recipes-devtools/diffstat/diffstat_1.58.bb | |||
@@ -0,0 +1,32 @@ | |||
1 | SUMMARY = "Tool to produce a statistics based on a diff" | ||
2 | DESCRIPTION = "diffstat reads the output of diff and displays a histogram of \ | ||
3 | the insertions, deletions, and modifications per-file. It is useful for \ | ||
4 | reviewing large, complex patch files." | ||
5 | HOMEPAGE = "http://invisible-island.net/diffstat/" | ||
6 | SECTION = "devel" | ||
7 | LICENSE = "MIT" | ||
8 | LIC_FILES_CHKSUM = "file://install-sh;endline=42;md5=b3549726c1022bee09c174c72a0ca4a5" | ||
9 | |||
10 | SRC_URI = "ftp://invisible-island.net/diffstat/diffstat-${PV}.tgz \ | ||
11 | file://dirfix.patch \ | ||
12 | file://aclocal.patch \ | ||
13 | file://run-ptest \ | ||
14 | " | ||
15 | |||
16 | SRC_URI[md5sum] = "6d6e13f7dcfe4db5da65c5175260ea47" | ||
17 | SRC_URI[sha256sum] = "fad5135199c3b9aea132c5d45874248f4ce0ff35f61abb8d03c3b90258713793" | ||
18 | |||
19 | S = "${WORKDIR}/diffstat-${PV}" | ||
20 | |||
21 | inherit autotools gettext ptest | ||
22 | |||
23 | do_configure () { | ||
24 | if [ ! -e ${S}/acinclude.m4 ]; then | ||
25 | mv ${S}/aclocal.m4 ${S}/acinclude.m4 | ||
26 | fi | ||
27 | autotools_do_configure | ||
28 | } | ||
29 | |||
30 | do_install_ptest() { | ||
31 | cp -r ${S}/testing ${D}${PTEST_PATH} | ||
32 | } | ||