mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 06:33:41 +00:00
f509935fe3
Automake releases 1.16.2 to 1.16.5 are major releases, the two before are minor releases. The first patch needed rewriting, some lines moved to be consistent with the same change upstream in other files. This also simplifies the patch. Second patch refreshed. Links to changelogs in order, oldest to newest. Link: https://lists.gnu.org/archive/html/info-gnu/2018-02/msg00008.html Link: https://lists.gnu.org/archive/html/info-gnu/2018-03/msg00002.html Link: https://lists.gnu.org/archive/html/info-gnu/2020-03/msg00009.html Link: https://lists.gnu.org/archive/html/info-gnu/2020-11/msg00005.html Link: https://lists.gnu.org/archive/html/info-gnu/2021-07/msg00013.html Link: https://lists.gnu.org/archive/html/info-gnu/2021-10/msg00000.html Signed-off-by: Michael Pratt <mcpratt@pm.me>
53 lines
1.9 KiB
Diff
53 lines
1.9 KiB
Diff
--- a/lib/Automake/Config.in
|
|
+++ b/lib/Automake/Config.in
|
|
@@ -34,7 +34,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
|
|
@@ -23,9 +23,11 @@ use 5.006;
|
|
use strict;
|
|
use warnings FATAL => 'all';
|
|
|
|
+$^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};
|
|
}
|
|
|
|
@@ -65,8 +67,8 @@ $perl_threads = 0;
|
|
# 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');
|
|
|
|
# Whether we should copy M4 file in $user_includes[0].
|
|
my $install = 0;
|
|
--- a/bin/automake.in
|
|
+++ b/bin/automake.in
|
|
@@ -26,9 +26,11 @@ use 5.006;
|
|
use strict;
|
|
use warnings FATAL => 'all';
|
|
|
|
+$^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
|