summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2014-10-27 22:12:00 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-31 10:18:26 +0000
commitbc6651cb313221b60ba394b161527cb287dfeeed (patch)
tree32a8c9eac3c00e38834e28b57b1597f4ba05dafb
parenta16aa96a0831b8cf6039b242b39e9475cab45355 (diff)
downloadpoky-bc6651cb313221b60ba394b161527cb287dfeeed.tar.gz
which-2.18: Use foreign strictness to avoid automake errors
Fixed: Makefile.am: error: required file './ChangeLog' not found (From OE-Core rev: c84bfa0f519e0bb74aed833a6318c21d91fce377) (From OE-Core rev: 21bffc855ed000d8419badb406343b6410c424b9) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/which/which-2.18/automake-foreign.patch27
-rw-r--r--meta/recipes-extended/which/which_2.18.bb4
2 files changed, 30 insertions, 1 deletions
diff --git a/meta/recipes-extended/which/which-2.18/automake-foreign.patch b/meta/recipes-extended/which/which-2.18/automake-foreign.patch
new file mode 100644
index 0000000000..8ab1d028eb
--- /dev/null
+++ b/meta/recipes-extended/which/which-2.18/automake-foreign.patch
@@ -0,0 +1,27 @@
1Subject: [PATCH] automake foreign strictness
2
3Use foreign strictness to avoid automake errors.
4
5Upstream-Status: Inappropriate [upstream no longer active]
6
7Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
8---
9 configure.ac | 5 +++--
10 1 files changed, 3 insertions(+), 2 deletions(-)
11
12diff --git a/configure.ac b/configure.ac
13index b30b6f5..bd3222c 100644
14--- a/configure.ac
15+++ b/configure.ac
16@@ -1,6 +1,7 @@
17 dnl Process this file with autoconf to produce a configure script.
18-AC_INIT(which.c)
19-AM_INIT_AUTOMAKE(which, 2.18)
20+AC_INIT([which],[2.18])
21+AC_CONFIG_SRCDIR(which.c)
22+AM_INIT_AUTOMAKE([foreign])
23 AM_CONFIG_HEADER(config.h)
24 AM_MAINTAINER_MODE
25
26--
271.7.1
diff --git a/meta/recipes-extended/which/which_2.18.bb b/meta/recipes-extended/which/which_2.18.bb
index 5fa5d9e8eb..fd68520d97 100644
--- a/meta/recipes-extended/which/which_2.18.bb
+++ b/meta/recipes-extended/which/which_2.18.bb
@@ -12,7 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
12PR = "r2" 12PR = "r2"
13 13
14SRC_URI = "http://www.xs4all.nl/~carlo17/which/which-${PV}.tar.gz \ 14SRC_URI = "http://www.xs4all.nl/~carlo17/which/which-${PV}.tar.gz \
15 file://fix_name_conflict_group_member.patch" 15 file://fix_name_conflict_group_member.patch \
16 file://automake-foreign.patch \
17"
16 18
17SRC_URI[md5sum] = "42d51938e48b91f6e19fabf216f5c3e9" 19SRC_URI[md5sum] = "42d51938e48b91f6e19fabf216f5c3e9"
18SRC_URI[sha256sum] = "9445cd7e02ec0c26a44fd56098464ded064ba5d93dd2e15ec12410ba56b2e544" 20SRC_URI[sha256sum] = "9445cd7e02ec0c26a44fd56098464ded064ba5d93dd2e15ec12410ba56b2e544"