libtool: fix build on systems with automake-1.11 (e.g. Fedora 10)

package/libtool/libtool-0001-mips64-n64-linking.patch touches an m4
file, so applying it triggers a run of autoconf, automake, etc. This
sometimes leads to build failures due to incompatible system autotools.
This was observed on Fedora 10, which has automake 1.11 while the
generated files that are included in the tarball require automake
1.11.1.

We cannot simply set HOST_LIBTOOL_AUTORECONF = YES because that would
create a circular dependency on host-libtool. Therefore, the patch
patch is applied on the installed libtool.m4 instead of in the source
tree. Then, it also needs to be renamed to something that doesn't
match buildroot's patch convention so it doesn't get picked up
automatically.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Arnout Vandecappelle 2014-02-21 00:09:47 +01:00 committed by Peter Korsgaard
parent b7740b32f6
commit ed73d1d2e3
2 changed files with 13 additions and 0 deletions

View File

@ -13,6 +13,19 @@ LIBTOOL_LICENSE_FILES = COPYING
HOST_LIBTOOL_LIBTOOL_PATCH = NO
# libtool-mips64-n64-linking.post-install-patch is an upstream patch that
# fixes MIPS64 n64 link failures. However, because the patch touches an m4
# file, applying it triggers a run of autoconf, automake, etc. This sometimes
# leads to build failures due to incompatible system autotools. We cannot
# simply set HOST_LIBTOOL_AUTORECONF = YES because that would create a
# circular dependency on host-libtool. Therefore, just apply the patch
# directly on the installed file.
define HOST_LIBTOOL_FIXUP_LIBTOOL_M4
patch $(HOST_DIR)/usr/share/aclocal/libtool.m4 < \
package/libtool/libtool-mips64-n64-linking.post-install-patch
endef
HOST_LIBTOOL_POST_INSTALL_HOOKS += HOST_LIBTOOL_FIXUP_LIBTOOL_M4
$(eval $(autotools-package))
$(eval $(host-autotools-package))