diff options
Diffstat (limited to 'meta/recipes-extended/diffutils')
5 files changed, 98 insertions, 0 deletions
diff --git a/meta/recipes-extended/diffutils/diffutils-2.8.1/diffutils_fix_for_automake-1.12.patch b/meta/recipes-extended/diffutils/diffutils-2.8.1/diffutils_fix_for_automake-1.12.patch new file mode 100644 index 0000000000..cc05d1dc06 --- /dev/null +++ b/meta/recipes-extended/diffutils/diffutils-2.8.1/diffutils_fix_for_automake-1.12.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | automake 1.12 has depricated automatic de-ANSI-fication support | ||
4 | |||
5 | this patch avoids these kinds of errors: | ||
6 | |||
7 | | configure.ac:90: error: automatic de-ANSI-fication support has been removed | ||
8 | | /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/aclocal-1.12/protos.m4:12: AM_C_PROTOTYPES is expanded from... | ||
9 | | /srv/home/nitin/builds/build-gcc47/tmp/work/i586-poky-linux/diffutils-2.8.1-r4/diffutils-2.8.1/m4/prereq.m4:110: jm_PREREQ_QUOTEARG is expanded from... | ||
10 | | configure.ac:90: the top level | ||
11 | | autom4te: m4 failed with exit status: 1 | ||
12 | |||
13 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
14 | 2012/05/04 | ||
15 | |||
16 | Index: diffutils-2.8.1/m4/prereq.m4 | ||
17 | =================================================================== | ||
18 | --- diffutils-2.8.1.orig/m4/prereq.m4 | ||
19 | +++ diffutils-2.8.1/m4/prereq.m4 | ||
20 | @@ -115,7 +115,6 @@ AC_DEFUN([jm_PREREQ_QUOTEARG], | ||
21 | AC_HEADER_STDC | ||
22 | AC_C_BACKSLASH_A | ||
23 | AC_MBSTATE_T | ||
24 | - AM_C_PROTOTYPES | ||
25 | ]) | ||
26 | |||
27 | AC_DEFUN([jm_PREREQ_REGEX], | ||
diff --git a/meta/recipes-extended/diffutils/diffutils-3.3/run-ptest b/meta/recipes-extended/diffutils/diffutils-3.3/run-ptest new file mode 100644 index 0000000000..695c5e8a7b --- /dev/null +++ b/meta/recipes-extended/diffutils/diffutils-3.3/run-ptest | |||
@@ -0,0 +1,3 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | make -C tests check-TESTS | ||
diff --git a/meta/recipes-extended/diffutils/diffutils.inc b/meta/recipes-extended/diffutils/diffutils.inc new file mode 100644 index 0000000000..243341aa9c --- /dev/null +++ b/meta/recipes-extended/diffutils/diffutils.inc | |||
@@ -0,0 +1,18 @@ | |||
1 | SUMMARY = "Diffutils contains tools used for finding differences between files" | ||
2 | DESCRIPTION = "Diffutils contains the GNU diff, diff3, \ | ||
3 | sdiff, and cmp utilities. These programs are usually \ | ||
4 | used for creating patch files." | ||
5 | SECTION = "base" | ||
6 | |||
7 | inherit autotools texinfo update-alternatives gettext | ||
8 | |||
9 | # diffutils assumes non-glibc compilation with uclibc and | ||
10 | # this causes it to generate its own implementations of | ||
11 | # standard functionality. regex.c actually breaks compilation | ||
12 | # because it uses __mempcpy, there are other things (TBD: | ||
13 | # see diffutils.mk in buildroot) | ||
14 | EXTRA_OECONF_libc-uclibc = "--without-included-regex" | ||
15 | |||
16 | ALTERNATIVE_${PN} = "diff cmp" | ||
17 | ALTERNATIVE_PRIORITY = "100" | ||
18 | |||
diff --git a/meta/recipes-extended/diffutils/diffutils_2.8.1.bb b/meta/recipes-extended/diffutils/diffutils_2.8.1.bb new file mode 100644 index 0000000000..bf425bbb35 --- /dev/null +++ b/meta/recipes-extended/diffutils/diffutils_2.8.1.bb | |||
@@ -0,0 +1,16 @@ | |||
1 | LICENSE = "GPLv2+" | ||
2 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | ||
3 | |||
4 | require diffutils.inc | ||
5 | |||
6 | PR = "r7.0" | ||
7 | |||
8 | SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz \ | ||
9 | file://diffutils_fix_for_automake-1.12.patch" | ||
10 | |||
11 | SRC_URI[md5sum] = "71f9c5ae19b60608f6c7f162da86a428" | ||
12 | SRC_URI[sha256sum] = "c5001748b069224dd98bf1bb9ee877321c7de8b332c8aad5af3e2a7372d23f5a" | ||
13 | |||
14 | do_configure_prepend () { | ||
15 | chmod u+w ${S}/po/Makefile.in.in | ||
16 | } | ||
diff --git a/meta/recipes-extended/diffutils/diffutils_3.3.bb b/meta/recipes-extended/diffutils/diffutils_3.3.bb new file mode 100644 index 0000000000..a467f20aa4 --- /dev/null +++ b/meta/recipes-extended/diffutils/diffutils_3.3.bb | |||
@@ -0,0 +1,34 @@ | |||
1 | LICENSE = "GPLv3+" | ||
2 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | ||
3 | |||
4 | require diffutils.inc | ||
5 | |||
6 | SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \ | ||
7 | file://run-ptest \ | ||
8 | " | ||
9 | |||
10 | do_configure_prepend () { | ||
11 | # Need to remove gettext macros with weird mix of versions | ||
12 | for i in codeset.m4 gettext_gl.m4 intlmacosx.m4 inttypes-pri.m4 lib-ld_gl.m4 lib-prefix_gl.m4 po_gl.m4 ssize_t.m4 wchar_t.m4 wint_t.m4; do | ||
13 | rm -f ${S}/m4/$i | ||
14 | done | ||
15 | } | ||
16 | |||
17 | SRC_URI[md5sum] = "99180208ec2a82ce71f55b0d7389f1b3" | ||
18 | SRC_URI[sha256sum] = "a25e89a8ab65fded1731e4186be1bb25cda967834b6df973599cdcd5abdfc19c" | ||
19 | |||
20 | inherit ptest | ||
21 | |||
22 | do_install_ptest() { | ||
23 | t=${D}${PTEST_PATH} | ||
24 | install -D ${S}/build-aux/test-driver $t/build-aux/test-driver | ||
25 | cp -r ${S}/tests $t/ | ||
26 | install ${B}/tests/Makefile $t/tests/ | ||
27 | sed -e 's|^Makefile:|_Makefile:|' \ | ||
28 | -e 's|bash|sh|' \ | ||
29 | -e 's|^top_srcdir = \(.*\)|top_srcdir = ..\/|' \ | ||
30 | -e 's|^srcdir = \(.*\)|srcdir = .|' \ | ||
31 | -e 's|"`$(built_programs)`"|diff|' \ | ||
32 | -e 's|gawk|awk|g' \ | ||
33 | -i $t/tests/Makefile | ||
34 | } | ||