Resneptacle/openwrt-cghmn-mt300n
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools/autoconf: Fix relocatable patch

Browse Source 
Fix the 000-relocatable.patch broken by e0f5ce9. The patch segment about
detecting STAGING_DIR_HOST was erroneously removed, as upstream had
deleted the previous bin/autoconf.as and had implemented it in perl
in bin/autoconf.in. Re-create the previous functionality in that.

Fixes: #18059
Fixes: e0f5ce974 ("tools/autoconf: bump to 2.72")
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Link: https://github.com/openwrt/openwrt/pull/18073
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Hannu Nyman 2025-02-22 18:47:52 +02:00 committed by Robert Marko
parent 15c27ce9f0
commit e03676a9ba
1 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,34 @@
--- a/bin/autoconf.in
+++ b/bin/autoconf.in
@@ -29,7 +29,10 @@ use warnings FATAL => 'all';
BEGIN
{
- my $pkgdatadir = $ENV{'autom4te_perllibdir'} || '@pkgdatadir@';
+ my $pkgdatadir = $ENV{'autom4te_perllibdir'} ||
+ ($ENV{'STAGING_DIR_HOST'} ?
+ $ENV{'STAGING_DIR_HOST'} . '/share/autoconf' :
+ '@pkgdatadir@');
unshift @INC, $pkgdatadir;
# Override SHELL. On DJGPP SHELL may not be set to a shell
@@ -44,8 +47,14 @@ use Autom4te::Channels qw(msg);
use Autom4te::General;
# Lib files.
-my $autom4te = $ENV{'AUTOM4TE'} || '@bindir@/@autom4te-name@';
-my $trailer_m4 = $ENV{'trailer_m4'} || '@pkgdatadir@/autoconf/trailer.m4';
+my $autom4te = $ENV{'AUTOM4TE'} ||
+ ($ENV{'STAGING_DIR_HOST'} ?
+ $ENV{'STAGING_DIR_HOST'} . '/bin/@autom4te-name@' :
+ '@bindir@/@autom4te-name@');
+my $trailer_m4 = $ENV{'trailer_m4'} ||
+ ($ENV{'STAGING_DIR_HOST'} ?
+ $ENV{'STAGING_DIR_HOST'} . '/share/autoconf/autoconf/trailer.m4' :
+ '@pkgdatadir@/autoconf/trailer.m4');
# $HELP
# -----
--- a/bin/autoheader.in
+++ b/bin/autoheader.in
@@ -30,9 +30,12 @@ use 5.006;