[Buildroot] [PATCH] libtool: revert a commit which re-introduced an already fixed problem
Peter Korsgaard
jacmet at uclibc.org
Mon Mar 17 22:08:34 UTC 2014
>>>>> "Vicente" == Vicente Olivert Riera <Vincent.Riera at imgtec.com> writes:
> The commit ed73d1d2e3703290e74bb076bc6dd0417aa3ba21 modified the changes
> made by the commit 4268d3967e2d691c151d6b5629e4051deb077b9a. The problem
> that was fixed by the former commit is present again due to those
> modifications. This patch reverts those modifications to have that
> problem fixed again.
> Fixes:
> http://autobuild.buildroot.net/results/b86/b86a83c6549004f226e7255242e54ef4e50c5ec3/
So this basically just reverts Arnouts fix for old automake versions? Do
we understand why it doesn't work? Can we come up with a solution that
both fixes the n64 issue and old automake?
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera at imgtec.com>
> ---
> ...patch => libtool-0001-mips64-n64-linking.patch} | 0
> package/libtool/libtool.mk | 13 -------------
> 2 files changed, 0 insertions(+), 13 deletions(-)
> rename package/libtool/{libtool-mips64-n64-linking.post-install-patch => libtool-0001-mips64-n64-linking.patch} (100%)
> diff --git a/package/libtool/libtool-mips64-n64-linking.post-install-patch b/package/libtool/libtool-0001-mips64-n64-linking.patch
> similarity index 100%
> rename from package/libtool/libtool-mips64-n64-linking.post-install-patch
> rename to package/libtool/libtool-0001-mips64-n64-linking.patch
> diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk
> index 603f1f1..2f6ea7c 100644
> --- a/package/libtool/libtool.mk
> +++ b/package/libtool/libtool.mk
> @@ -13,19 +13,6 @@ 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))
> --
> 1.7.1
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
Bye, Peter Korsgaard
More information about the buildroot
mailing list