mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2025-12-10 08:44:39 +01:00
d7d0205940
Some checks are pending
Build all core packages / Build all core packages for selected target (push) Waiting to run
Build and Push prebuilt tools container / Build and Push all prebuilt containers (push) Waiting to run
Build host tools / Build host tools for linux and macos based systems (push) Waiting to run
Update to the latest stable release with the new API versions for binaries. The temporary patching of shebangs is no longer necessary since the whitespace check has been changed to a warning. Part of a patch was upstreamed and therefore removed. Manually adjusted patch: - 000-relocatable.patch - 101-do-not-require-files.patch All other patches are automatically refreshed. Link: https://lists.gnu.org/archive/html/autotools-announce/2025-05/msg00001.html Signed-off-by: Michael Pratt <mcpratt@pm.me> Link: https://github.com/openwrt/openwrt/pull/16522 Signed-off-by: Robert Marko <robimarko@gmail.com>
52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
--- a/lib/Automake/Config.in
|
|
+++ b/lib/Automake/Config.in
|
|
@@ -32,7 +32,7 @@ our $PACKAGE = '@PACKAGE@';
|
|
our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@';
|
|
our $VERSION = '@VERSION@';
|
|
our $RELEASE_YEAR = '@RELEASE_YEAR@';
|
|
-our $libdir = $ENV{"AUTOMAKE_LIBDIR"} || '@datadir@/@PACKAGE@-@APIVERSION@';
|
|
+our $libdir = $ENV{'STAGING_DIR_HOST'} ? $ENV{'STAGING_DIR_HOST'} . '/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@';
|
|
|
|
our $perl_threads = 0;
|
|
# We need at least this version for CLONE support.
|
|
--- a/bin/aclocal.in
|
|
+++ b/bin/aclocal.in
|
|
@@ -21,9 +21,11 @@
|
|
|
|
use 5.006; use strict; use warnings;
|
|
|
|
+$^W = 1;
|
|
+
|
|
BEGIN
|
|
{
|
|
- unshift (@INC, '@datadir@/@PACKAGE@-@APIVERSION@')
|
|
+ unshift (@INC, ($ENV{'STAGING_DIR_HOST'} ? $ENV{'STAGING_DIR_HOST'} . '/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@'))
|
|
unless $ENV{AUTOMAKE_UNINSTALLED};
|
|
}
|
|
|
|
@@ -63,8 +65,8 @@ $perl_threads = 0;
|
|
# --aclocal-path option/ACLOCAL_PATH environment variable, and reset
|
|
# with the '--system-acdir' option.
|
|
my @user_includes = ();
|
|
-my @automake_includes = ('@datadir@/aclocal-' . $APIVERSION);
|
|
-my @system_includes = ('@datadir@/aclocal');
|
|
+my @automake_includes = ($ENV{'STAGING_DIR_HOST'} ? $ENV{'STAGING_DIR_HOST'} . "/share/aclocal-$APIVERSION" : "@datadir@/aclocal-$APIVERSION");
|
|
+my @system_includes = ($ENV{'STAGING_DIR_HOST'} ? $ENV{'STAGING_DIR_HOST'} . '/share/aclocal' : '@datadir@/aclocal');
|
|
my $aclocal_path = '';
|
|
|
|
# Whether we should copy M4 file in $user_includes[0].
|
|
--- a/bin/automake.in
|
|
+++ b/bin/automake.in
|
|
@@ -24,9 +24,11 @@ package Automake;
|
|
|
|
use 5.006; use strict; use warnings;
|
|
|
|
+$^W = 1;
|
|
+
|
|
BEGIN
|
|
{
|
|
- unshift (@INC, '@datadir@/@PACKAGE@-@APIVERSION@')
|
|
+ unshift (@INC, ($ENV{'STAGING_DIR_HOST'} ? $ENV{'STAGING_DIR_HOST'} . '/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@'))
|
|
unless $ENV{AUTOMAKE_UNINSTALLED};
|
|
|
|
# Override SHELL. This is required on DJGPP so that system() uses
|