6f9fbfdd7f
In4268d39, a patch was added to update libtool.m4 for MIPS n64 targets. However, this caused the configure script to be regenerated during the build steps, which in turn caused build failures on Fedora 12 hosts. Ined73d1d, this was fixed by patching the installed libtool.m4 file instead of the source file. However,ed73d1ddid not take into account that the target libtool will also install libtool.m4 to staging, and that that version has precedence over the one in HOST_DIR. Therefore, this patch takes a different approach: the source file is patched in the usual way, and instead the reconfigure is avoided by touching the generated files. On the target, we also cannot use the AUTORECONF mechanism because of some mysterious Makefile.inc file. So just use the same approach and wait for upstream to make a new release. Fixes: http://autobuild.buildroot.net/results/b86/b86a83c6549004f226e7255242e54ef4e50c5ec3/ Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
42 lines
1.6 KiB
Makefile
42 lines
1.6 KiB
Makefile
################################################################################
|
|
#
|
|
# libtool
|
|
#
|
|
################################################################################
|
|
|
|
LIBTOOL_VERSION = 2.4.2
|
|
LIBTOOL_SOURCE = libtool-$(LIBTOOL_VERSION).tar.xz
|
|
LIBTOOL_SITE = $(BR2_GNU_MIRROR)/libtool
|
|
LIBTOOL_INSTALL_STAGING = YES
|
|
LIBTOOL_LICENSE = GPLv2+
|
|
LIBTOOL_LICENSE_FILES = COPYING
|
|
|
|
HOST_LIBTOOL_LIBTOOL_PATCH = NO
|
|
|
|
# We have a patch that affects libtool.m4, which triggers an autoreconf
|
|
# in the build step. Normally we would set AUTORECONF = YES, but this
|
|
# doesn't work for host-libtool because that creates a circular
|
|
# dependency. Instead, touch the generated files so autoreconf is not
|
|
# triggered in the build step. Note that aclocal.m4 has to be touched
|
|
# first since the rest depends on it. Note that we don't need the changes
|
|
# in libtool.m4 in our configure script, because we're not actually
|
|
# running it on the target.
|
|
# For the target, we would normally be able to use AUTORECONF, but it
|
|
# fails on libltdl/Makefile.inc. Rather than trying to fix that failure,
|
|
# just use the same hack as on the host.
|
|
define LIBTOOL_AVOID_AUTORECONF_HOOK
|
|
find $(@D) -name aclocal.m4 -exec touch '{}' \;
|
|
find $(@D) -name config-h.in -exec touch '{}' \;
|
|
find $(@D) -name configure -exec touch '{}' \;
|
|
find $(@D) -name Makefile.in -exec touch '{}' \;
|
|
endef
|
|
LIBTOOL_PRE_CONFIGURE_HOOKS += LIBTOOL_AVOID_AUTORECONF_HOOK
|
|
HOST_LIBTOOL_PRE_CONFIGURE_HOOKS += LIBTOOL_AVOID_AUTORECONF_HOOK
|
|
|
|
$(eval $(autotools-package))
|
|
$(eval $(host-autotools-package))
|
|
|
|
# variables used by other packages
|
|
LIBTOOL = $(HOST_DIR)/usr/bin/libtool
|
|
LIBTOOLIZE = $(HOST_DIR)/usr/bin/libtoolize
|