hurricos/openwrt-mirror
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-11-03 14:34:27 -05:00
Code Issues Projects Releases Wiki Activity

tools/autoconf: ensure relocatability

Browse Source 
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>
This commit is contained in:
Jo-Philipp Wich 2023-03-16 00:31:16 +01:00
parent f576762814
commit 0ba130abb2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/autoconf/patches/000-relocatable.patch
View File

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