diff options
author | Jackie Huang <jackie.huang@windriver.com> | 2014-10-27 22:12:00 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-10-30 13:37:41 +0000 |
commit | 70ad0500e7de53892e61c8ceae94064ae6370d79 (patch) | |
tree | e085366b030914271aea445be4da31fc933a65d0 /meta | |
parent | e962f99ef0046d28c8aa755b2e4c9eaef208be2d (diff) | |
download | poky-70ad0500e7de53892e61c8ceae94064ae6370d79.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)
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/which/which-2.18/automake-foreign.patch | 28 | ||||
-rw-r--r-- | meta/recipes-extended/which/which_2.18.bb | 4 |
2 files changed, 31 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..495cdc6cf4 --- /dev/null +++ b/meta/recipes-extended/which/which-2.18/automake-foreign.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | Subject: [PATCH] automake foreign strictness | ||
2 | |||
3 | Use foreign strictness to avoid automake errors. | ||
4 | |||
5 | Upstream-Status: Inappropriate [upstream no longer active] | ||
6 | |||
7 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
8 | --- | ||
9 | configure.ac | 5 +++-- | ||
10 | 1 files changed, 3 insertions(+), 2 deletions(-) | ||
11 | |||
12 | diff --git a/configure.ac b/configure.ac | ||
13 | index 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 | -- | ||
27 | 1.7.1 | ||
28 | |||
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" | |||
12 | PR = "r2" | 12 | PR = "r2" |
13 | 13 | ||
14 | SRC_URI = "http://www.xs4all.nl/~carlo17/which/which-${PV}.tar.gz \ | 14 | SRC_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 | ||
17 | SRC_URI[md5sum] = "42d51938e48b91f6e19fabf216f5c3e9" | 19 | SRC_URI[md5sum] = "42d51938e48b91f6e19fabf216f5c3e9" |
18 | SRC_URI[sha256sum] = "9445cd7e02ec0c26a44fd56098464ded064ba5d93dd2e15ec12410ba56b2e544" | 20 | SRC_URI[sha256sum] = "9445cd7e02ec0c26a44fd56098464ded064ba5d93dd2e15ec12410ba56b2e544" |