[openwrt/openwrt] automake: always use correct path for aclocal.real

LEDE Commits lede-commits at lists.infradead.org
Thu Jul 14 11:03:51 PDT 2022


ansuel pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/ffd9bd7b9b5f54b71bc4bba33f9a53dddc47d585

commit ffd9bd7b9b5f54b71bc4bba33f9a53dddc47d585
Author: Leonardo Mörlein <me at irrelefant.net>
AuthorDate: Tue Aug 10 00:48:40 2021 +0200

    automake: always use correct path for aclocal.real
    
    Before this commit, it was assumed that aclocal.real is in the PATH. While
    this was fine for the normal build workflow, this led to some issues if
    
        make TOPDIR="$(pwd)" -C "$pkgdir" compile
    
    was called manually. The command failed with:
    
        /home/.../openwrt/staging_dir/host/bin/aclocal: line 2: aclocal.real: command not found
        autoreconf: /home/.../openwrt/staging_dir/host/bin/aclocal failed with exit status: 127
    
    After the commit, the package is built sucessfully.
    
    Signed-off-by: Leonardo Mörlein <me at irrelefant.net>
---
 tools/automake/files/aclocal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/automake/files/aclocal b/tools/automake/files/aclocal
index a60df10c42..689cb041f5 100755
--- a/tools/automake/files/aclocal
+++ b/tools/automake/files/aclocal
@@ -1,2 +1,2 @@
 #!/usr/bin/env sh
-aclocal.real $ACLOCAL_INCLUDE $@
+${STAGING_DIR_HOST}/bin/aclocal.real $ACLOCAL_INCLUDE $@




More information about the lede-commits mailing list