diff options
| -rw-r--r-- | package/libtool/libtool-mips64-n64-linking.post-install-patch (renamed from package/libtool/libtool-0001-mips64-n64-linking.patch) | 0 | ||||
| -rw-r--r-- | package/libtool/libtool.mk | 13 |
2 files changed, 13 insertions, 0 deletions
diff --git a/package/libtool/libtool-0001-mips64-n64-linking.patch b/package/libtool/libtool-mips64-n64-linking.post-install-patch index ef9084ddb6..ef9084ddb6 100644 --- a/package/libtool/libtool-0001-mips64-n64-linking.patch +++ b/package/libtool/libtool-mips64-n64-linking.post-install-patch diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk index 2f6ea7c5cf..603f1f1c2c 100644 --- a/package/libtool/libtool.mk +++ b/package/libtool/libtool.mk @@ -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)) |
