]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commit
autotools-package: also handle pre-installed external toolchain in .la fixup
authorArnout Vandecappelle <arnout@mind.be>
Sun, 3 May 2015 21:30:38 +0000 (23:30 +0200)
committerPeter Korsgaard <peter@korsgaard.com>
Mon, 4 May 2015 12:38:02 +0000 (14:38 +0200)
commit8c488211385b4f46cb290fbdc79bdb1912c1d1be
tree4ff59199d63f84f3a90a85d21f090bbf42d2c0eb
parentc1b0a0dc566e1af831ee4e961c596c58f26a5510
autotools-package: also handle pre-installed external toolchain in .la fixup

The .la fixup handling looks for paths starting with /usr and assumes
that they are missing the installation prefix (i.e. $(STAGING_DIR)). It
already handles the cases that $(STAGING_DIR) itself and $(BASE_DIR)
are under /usr, but it does not yet handle the case that a
pre-installed external toolchain is under /usr (and tracks that fact
in some .la file). For instance, if you use buildroot to generate a
toolchain with HOST_DIR=/usr/local/some_path, this problem will occur.

Fix this in the same way as $(STAGING_DIR) and $(BASE_DIR), but in
addition check that TOOLCHAIN_EXTERNAL_INSTALL_DIR is non-empty. For
internal toolchains, it is empty and the sed expression would fail.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Reported-by: Carlos Soto <csotoalonso@gmail.com>
Cc: Carlos Soto <csotoalonso@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/pkg-autotools.mk