summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/diffutils
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-07-26 16:18:48 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-15 14:26:29 +0100
commitff5c7e2ad9458f519bc8afe6b4ba34fe6627bd4c (patch)
tree9461b1a7e7fe528d8596ebec5b975ef750d49cbe /meta/recipes-extended/diffutils
parent6bb519b048d4a120552426046d339ece38949549 (diff)
downloadpoky-ff5c7e2ad9458f519bc8afe6b4ba34fe6627bd4c.tar.gz
diffutils: refactor to add a common diffutils.inc
(From OE-Core rev: f5f3cf1ac4c2dd3cae0cda3c858c8e5b309e1fdc) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/diffutils')
-rw-r--r--meta/recipes-extended/diffutils/diffutils.inc22
-rw-r--r--meta/recipes-extended/diffutils/diffutils_2.8.1.bb24
-rw-r--r--meta/recipes-extended/diffutils/diffutils_3.2.bb22
3 files changed, 29 insertions, 39 deletions
diff --git a/meta/recipes-extended/diffutils/diffutils.inc b/meta/recipes-extended/diffutils/diffutils.inc
new file mode 100644
index 0000000000..3964db0636
--- /dev/null
+++ b/meta/recipes-extended/diffutils/diffutils.inc
@@ -0,0 +1,22 @@
1SUMMARY = "Diffutils contains tools used for finding differences between files."
2DESCRIPTION = "Diffutils contains the GNU diff, diff3, \
3sdiff, and cmp utilities. These programs are usually \
4used for creating patch files."
5SECTION = "base"
6
7INC_PR = "r6"
8
9SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz"
10
11inherit autotools update-alternatives gettext
12
13# diffutils assumes non-glibc compilation with uclibc and
14# this causes it to generate its own implementations of
15# standard functionality. regex.c actually breaks compilation
16# because it uses __mempcpy, there are other things (TBD:
17# see diffutils.mk in buildroot)
18EXTRA_OECONF_libc-uclibc = "--without-included-regex"
19
20ALTERNATIVE_LINKS = "${bindir}/diff ${bindir}/cmp"
21ALTERNATIVE_PRIORITY = "100"
22
diff --git a/meta/recipes-extended/diffutils/diffutils_2.8.1.bb b/meta/recipes-extended/diffutils/diffutils_2.8.1.bb
index 09eb71e665..a31363aefb 100644
--- a/meta/recipes-extended/diffutils/diffutils_2.8.1.bb
+++ b/meta/recipes-extended/diffutils/diffutils_2.8.1.bb
@@ -1,28 +1,12 @@
1SUMMARY = "Diffutils contains tools used for finding differences between files."
2DESCRIPTION = "Diffutils contains the GNU diff, diff3, \
3sdiff, and cmp utilities. These programs are usually \
4used for creating patch files."
5SECTION = "base"
6LICENSE = "GPLv2+" 1LICENSE = "GPLv2+"
7LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 2LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
8 3
9PR = "r5" 4require diffutils.inc
10 5
11SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz \ 6PR = "${INC_PR}.0"
12 file://diffutils_fix_for_automake-1.12.patch \ 7
13 " 8SRC_URI += "file://diffutils_fix_for_automake-1.12.patch"
14 9
15SRC_URI[md5sum] = "71f9c5ae19b60608f6c7f162da86a428" 10SRC_URI[md5sum] = "71f9c5ae19b60608f6c7f162da86a428"
16SRC_URI[sha256sum] = "c5001748b069224dd98bf1bb9ee877321c7de8b332c8aad5af3e2a7372d23f5a" 11SRC_URI[sha256sum] = "c5001748b069224dd98bf1bb9ee877321c7de8b332c8aad5af3e2a7372d23f5a"
17 12
18inherit autotools update-alternatives gettext
19
20# diffutils assumes non-glibc compilation with uclibc and
21# this causes it to generate its own implementations of
22# standard functionality. regex.c actually breaks compilation
23# because it uses __mempcpy, there are other things (TBD:
24# see diffutils.mk in buildroot)
25EXTRA_OECONF_libc-uclibc = "--without-included-regex"
26
27ALTERNATIVE_LINKS = "${bindir}/diff ${bindir}/cmp"
28ALTERNATIVE_PRIORITY = "100"
diff --git a/meta/recipes-extended/diffutils/diffutils_3.2.bb b/meta/recipes-extended/diffutils/diffutils_3.2.bb
index c46863d3a7..74c371dc9e 100644
--- a/meta/recipes-extended/diffutils/diffutils_3.2.bb
+++ b/meta/recipes-extended/diffutils/diffutils_3.2.bb
@@ -1,27 +1,11 @@
1DESCRIPTION = "Diffutils contains the GNU diff, diff3, \
2sdiff, and cmp utilities. These programs are usually \
3used for creating patch files."
4SECTION = "base"
5LICENSE = "GPLv3+" 1LICENSE = "GPLv3+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 2LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
7 3
8PR = "r1" 4require diffutils.inc
9 5
10SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz \ 6PR = "${INC_PR}.0"
11 file://remove-gets.patch \
12 "
13 7
14inherit autotools update-alternatives gettext 8SRC_URI += "file://remove-gets.patch"
15
16# diffutils assumes non-glibc compilation with uclibc and
17# this causes it to generate its own implementations of
18# standard functionality. regex.c actually breaks compilation
19# because it uses __mempcpy, there are other things (TBD:
20# see diffutils.mk in buildroot)
21EXTRA_OECONF_libc-uclibc = "--without-included-regex"
22
23ALTERNATIVE_LINKS = "${bindir}/diff ${bindir}/cmp"
24ALTERNATIVE_PRIORITY = "100"
25 9
26SRC_URI[md5sum] = "22e4deef5d8949a727b159d6bc65c1cc" 10SRC_URI[md5sum] = "22e4deef5d8949a727b159d6bc65c1cc"
27SRC_URI[sha256sum] = "2aaaebef615be7dc365306a14caa5d273a4fc174f9f10abca8b60e082c054ed3" 11SRC_URI[sha256sum] = "2aaaebef615be7dc365306a14caa5d273a4fc174f9f10abca8b60e082c054ed3"