diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2023-03-16 00:31:16 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2023-03-16 00:32:59 +0100 |
| commit | 0ba130abb2c90c76b6b63f389da02b8bcfe6b78e (patch) | |
| tree | ccb41289ef75735cd31f2628a3832ffbd3683224 | |
| parent | f576762814bd1fc15cebedbd6c3f4f9b3f5ed858 (diff) | |
| download | openwrt-0ba130abb2c90c76b6b63f389da02b8bcfe6b78e.tar.gz | |
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 <jo@mein.io>
| -rw-r--r-- | tools/autoconf/patches/000-relocatable.patch | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/autoconf/patches/000-relocatable.patch b/tools/autoconf/patches/000-relocatable.patch index a105defd29..3961d2264b 100644 --- a/tools/autoconf/patches/000-relocatable.patch +++ b/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 |