diff options
author | Ross Burton <ross.burton@intel.com> | 2014-05-28 12:56:25 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-29 17:53:40 +0100 |
commit | b066f8723aa394729b77f6ae139fde25803b9f3b (patch) | |
tree | 1931e5025cb4061b433e8ceabe8e6876bd77b74a /meta/recipes-core/readline/readline.inc | |
parent | 385b2d4356c7896ea96a58edb06194a40f9e219d (diff) | |
download | poky-b066f8723aa394729b77f6ae139fde25803b9f3b.tar.gz |
readline: use upstream's aclocal.m4 as acinclude.m4
Instead of shipping a fork of the upstream aclocal.m4, simply rename it to
acinclude.m4 at configure time. We don't need the fork now that autoheader is
excluded.
(From OE-Core rev: e531923c4c17becb2f1a8a89adfeff0a82961a4a)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/readline/readline.inc')
-rw-r--r-- | meta/recipes-core/readline/readline.inc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc index 2c5ad002f7..0ce3b519e6 100644 --- a/meta/recipes-core/readline/readline.inc +++ b/meta/recipes-core/readline/readline.inc | |||
@@ -14,8 +14,7 @@ DEPENDS += "ncurses" | |||
14 | SRC_URI = "${GNU_MIRROR}/readline/${BPN}-${PV}.tar.gz;name=archive \ | 14 | SRC_URI = "${GNU_MIRROR}/readline/${BPN}-${PV}.tar.gz;name=archive \ |
15 | file://configure-fix.patch \ | 15 | file://configure-fix.patch \ |
16 | file://config-dirent-symbols.patch \ | 16 | file://config-dirent-symbols.patch \ |
17 | file://norpath.patch \ | 17 | file://norpath.patch" |
18 | file://acinclude.m4" | ||
19 | 18 | ||
20 | S = "${WORKDIR}/${BPN}-${PV}" | 19 | S = "${WORKDIR}/${BPN}-${PV}" |
21 | 20 | ||
@@ -26,7 +25,9 @@ EXTRA_AUTORECONF += "--exclude=autoheader" | |||
26 | LEAD_SONAME = "libreadline.so" | 25 | LEAD_SONAME = "libreadline.so" |
27 | 26 | ||
28 | do_configure_prepend () { | 27 | do_configure_prepend () { |
29 | install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ | 28 | if [ ! -e ${S}/acinclude.m4 ]; then |
29 | cat ${S}/aclocal.m4 > ${S}/acinclude.m4 | ||
30 | fi | ||
30 | } | 31 | } |
31 | 32 | ||
32 | do_install_append () { | 33 | do_install_append () { |