浏览代码

tools/autoconf: ensure relocatability

Upstream introduced a new `trailer.m4` macro file referenced by the
absolute build path of autoconf. Make sure that this is covered by
the `000-relocatable.patch` as well.

This should fix various SDK build failures related to autoconf.

Fixes: 030447b8f4 ("tools/autoconf: bump to 2.71")
Signed-off-by: Jo-Philipp Wich <[email protected]>
Jo-Philipp Wich 2 年之前
父节点
当前提交
0ba130abb2
共有 1 个文件被更改,包括 5 次插入2 次删除
  1. 5 2
      tools/autoconf/patches/000-relocatable.patch

+ 5 - 2
tools/autoconf/patches/000-relocatable.patch

@@ -177,16 +177,19 @@
    # Override SHELL.  On DJGPP SHELL may not be set to a shell
 --- a/bin/autoconf.as
 +++ b/bin/autoconf.as
-@@ -89,7 +89,11 @@ exit_missing_arg='
+@@ -89,8 +89,13 @@ exit_missing_arg='
  # restore font-lock: '
  
  # Variables.
 -: ${AUTOM4TE='@bindir@/@autom4te-name@'}
+-: ${trailer_m4='@pkgdatadir@/autoconf/trailer.m4'}
 +if test -n "$STAGING_DIR_HOST"; then
 +	: ${AUTOM4TE="$STAGING_DIR_HOST/bin/@autom4te-name@"}
++	: ${trailer_m4="$STAGING_DIR_HOST/share/autoconf/autoconf/trailer.m4"}
 +else
 +	: ${AUTOM4TE='@bindir@/@autom4te-name@'}
++	: ${trailer_m4='@pkgdatadir@/autoconf/trailer.m4'}
 +fi
- : ${trailer_m4='@pkgdatadir@/autoconf/trailer.m4'}
  autom4te_options=
  outfile=
+ verbose=false