summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/which/which-2.20/remove-declaration.patch18
-rw-r--r--meta/recipes-extended/which/which-2.21/automake.patch (renamed from meta/recipes-extended/which/which-2.20/automake.patch)14
-rw-r--r--meta/recipes-extended/which/which_2.21.bb (renamed from meta/recipes-extended/which/which_2.20.bb)6
3 files changed, 12 insertions, 26 deletions
diff --git a/meta/recipes-extended/which/which-2.20/remove-declaration.patch b/meta/recipes-extended/which/which-2.20/remove-declaration.patch
deleted file mode 100644
index d3340a3530..0000000000
--- a/meta/recipes-extended/which/which-2.20/remove-declaration.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1Remove the declaration of group_member since it has already been
2declared in unistd.h
3
4Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
5
6Upstream-Status: Inappropriate [embedded specific]
7
8diff -ruN which-2.20-orig/bash.c which-2.20/bash.c
9--- which-2.20-orig/bash.c 2010-08-03 12:59:08.897088878 +0800
10+++ which-2.20/bash.c 2010-08-03 13:17:23.406097212 +0800
11@@ -46,7 +46,6 @@
12 * - changed all occurences of 'gid_t' into 'GID_T'.
13 * - exported functions needed in which.c
14 */
15-static int group_member (GID_T gid);
16 static char* extract_colon_unit (char const* string, int* p_index);
17
18 /*===========================================================================
diff --git a/meta/recipes-extended/which/which-2.20/automake.patch b/meta/recipes-extended/which/which-2.21/automake.patch
index ef00bc9f23..4d0f2e4d7b 100644
--- a/meta/recipes-extended/which/which-2.20/automake.patch
+++ b/meta/recipes-extended/which/which-2.21/automake.patch
@@ -7,9 +7,13 @@ diff --git a/configure.ac b/configure.ac
7index d974461..a20dfa8 100644 7index d974461..a20dfa8 100644
8--- a/configure.ac 8--- a/configure.ac
9+++ b/configure.ac 9+++ b/configure.ac
10@@ -2,2 +2,3 @@ dnl Process this file with autoconf to produce a configure script. 10@@ -1,7 +1,7 @@
11-AC_INIT(which.c) 11 dnl Process this file with autoconf to produce a configure script.
12-AM_INIT_AUTOMAKE(which, 2.20) 12 AC_INIT([which], [2.21])
13+AC_INIT([which],[2.20]) 13 AC_CONFIG_SRCDIR(which.c)
14+AC_CONFIG_SRCDIR(which.c) 14-AM_INIT_AUTOMAKE
15+AM_INIT_AUTOMAKE([foreign]) 15+AM_INIT_AUTOMAKE([foreign])
16 AM_CONFIG_HEADER(config.h)
17 AM_MAINTAINER_MODE
18
19
diff --git a/meta/recipes-extended/which/which_2.20.bb b/meta/recipes-extended/which/which_2.21.bb
index 74835543de..a7687f6fe4 100644
--- a/meta/recipes-extended/which/which_2.20.bb
+++ b/meta/recipes-extended/which/which_2.21.bb
@@ -19,10 +19,10 @@ EXTRA_OECONF = "--disable-iberty"
19 19
20SRC_URI = "${GNU_MIRROR}/which/which-${PV}.tar.gz \ 20SRC_URI = "${GNU_MIRROR}/which/which-${PV}.tar.gz \
21 file://automake.patch \ 21 file://automake.patch \
22 file://remove-declaration.patch" 22 "
23 23
24SRC_URI[md5sum] = "95be0501a466e515422cde4af46b2744" 24SRC_URI[md5sum] = "097ff1a324ae02e0a3b0369f07a7544a"
25SRC_URI[sha256sum] = "d417b65c650d88ad26a208293c1c6e3eb60d4b6d847f01ff8f66aca63e2857f8" 25SRC_URI[sha256sum] = "f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad"
26 26
27do_configure_prepend() { 27do_configure_prepend() {
28 sed -i -e 's%@ACLOCAL_CWFLAGS@%-I ${STAGING_DIR_NATIVE}/usr/share/cwautomacros/m4%g' ${S}/Makefile.am ${S}/tilde/Makefile.am 28 sed -i -e 's%@ACLOCAL_CWFLAGS@%-I ${STAGING_DIR_NATIVE}/usr/share/cwautomacros/m4%g' ${S}/Makefile.am ${S}/tilde/Makefile.am