mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-14 11:13:29 +00:00
tools/automake: bump to 1.16.5
This commit is contained in:
coolsnowwolf
parent
d3ab2cd000
commit
c897f32a45
@ -8,16 +8,16 @@ include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=automake
|
||||
PKG_CPE_ID:=cpe:/a:gnu:automake
|
||||
PKG_VERSION:=1.15.1
|
||||
PKG_VERSION:=1.16.5
|
||||
PKG_API_VERSION:=$(word 2,$(subst ., ,$(PKG_VERSION)))
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=@GNU/automake
|
||||
PKG_HASH:=af6ba39142220687c500f79b4aa2f181d9b24e4f8d8ec497cea4ba26c64bedaf
|
||||
PKG_HASH:=07bd24ad08a64bc17250ce09ec56e921d6343903943e99ccf63bbf0705e34605
|
||||
|
||||
include $(INCLUDE_DIR)/host-build.mk
|
||||
|
||||
HOST_CONFIGURE_ARGS += \
|
||||
--datarootdir=$(STAGING_DIR_HOST)/share \
|
||||
--disable-silent-rules
|
||||
|
||||
HOST_CONFIGURE_VARS += \
|
||||
@ -31,20 +31,23 @@ endef
|
||||
|
||||
define Host/Install
|
||||
# remove old automake resources to avoid version conflicts
|
||||
rm -rf $(STAGING_DIR_HOST)/share/aclocal-[0-9]*
|
||||
rm -rf $(STAGING_DIR_HOST)/share/automake-[0-9]*
|
||||
$(MAKE) -C $(HOST_BUILD_DIR) install
|
||||
$(call Host/Uninstall)
|
||||
$(call Host/Compile/Default,install)
|
||||
mv $(STAGING_DIR_HOST)/bin/aclocal $(STAGING_DIR_HOST)/bin/aclocal.real
|
||||
$(INSTALL_BIN) ./files/aclocal $(STAGING_DIR_HOST)/bin
|
||||
ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.9
|
||||
ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.10
|
||||
ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.11
|
||||
ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.11.6
|
||||
ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.15
|
||||
( \
|
||||
api=$(PKG_API_VERSION); \
|
||||
while [ "$$$$api" -ge 11 ]; do \
|
||||
ln -sf aclocal "$(STAGING_DIR_HOST)/bin/aclocal-1.$$$$api"; \
|
||||
api=$$$$(($$$$api - 1)); \
|
||||
done; \
|
||||
)
|
||||
endef
|
||||
|
||||
define Host/Uninstall
|
||||
-$(call Host/Compile/Default,uninstall)
|
||||
rm -rf $(STAGING_DIR_HOST)/share/aclocal-[0-9]*
|
||||
rm -rf $(STAGING_DIR_HOST)/share/automake-[0-9]*
|
||||
endef
|
||||
|
||||
$(eval $(call HostBuild))
|
||||
|
||||
@ -1,44 +1,34 @@
|
||||
--- a/lib/Automake/Config.in
|
||||
+++ b/lib/Automake/Config.in
|
||||
@@ -32,7 +32,7 @@ our $PACKAGE = '@PACKAGE@';
|
||||
@@ -34,7 +34,7 @@ our $PACKAGE = '@PACKAGE@';
|
||||
our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@';
|
||||
our $VERSION = '@VERSION@';
|
||||
our $RELEASE_YEAR = '@RELEASE_YEAR@';
|
||||
-our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
|
||||
-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
|
||||
@@ -1,10 +1,12 @@
|
||||
-#!@PERL@ -w
|
||||
+#!@PERL@
|
||||
# -*- perl -*-
|
||||
# @configure_input@
|
||||
|
||||
eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
|
||||
if 0;
|
||||
@@ -23,9 +23,11 @@ use 5.006;
|
||||
use strict;
|
||||
use warnings FATAL => 'all';
|
||||
|
||||
+$^W = 1;
|
||||
+
|
||||
# aclocal - create aclocal.m4 by scanning configure.ac
|
||||
|
||||
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
|
||||
@@ -27,7 +29,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
|
||||
|
||||
BEGIN
|
||||
{
|
||||
- @Aclocal::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@')
|
||||
+ @Aclocal::perl_libdirs = ($ENV{'STAGING_DIR_HOST'} ? $ENV{'STAGING_DIR_HOST'} . '/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@')
|
||||
unless @Aclocal::perl_libdirs;
|
||||
unshift @INC, @Aclocal::perl_libdirs;
|
||||
- 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};
|
||||
}
|
||||
@@ -69,8 +71,8 @@ $perl_threads = 0;
|
||||
|
||||
@@ -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 @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');
|
||||
@ -47,50 +37,16 @@
|
||||
my $install = 0;
|
||||
--- a/bin/automake.in
|
||||
+++ b/bin/automake.in
|
||||
@@ -1,10 +1,12 @@
|
||||
-#!@PERL@ -w
|
||||
+#!@PERL@
|
||||
# -*- perl -*-
|
||||
# @configure_input@
|
||||
|
||||
eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
|
||||
if 0;
|
||||
@@ -26,9 +26,11 @@ use 5.006;
|
||||
use strict;
|
||||
use warnings FATAL => 'all';
|
||||
|
||||
+$^W = 1;
|
||||
+
|
||||
# automake - create Makefile.in from Makefile.am
|
||||
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
|
||||
|
||||
@@ -31,7 +33,7 @@ use strict;
|
||||
|
||||
BEGIN
|
||||
{
|
||||
- @Automake::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@')
|
||||
+ @Automake::perl_libdirs = ($ENV{'STAGING_DIR_HOST'} ? $ENV{'STAGING_DIR_HOST'} . '/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@')
|
||||
unless @Automake::perl_libdirs;
|
||||
unshift @INC, @Automake::perl_libdirs;
|
||||
- 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};
|
||||
|
||||
--- a/t/wrap/aclocal.in
|
||||
+++ b/t/wrap/aclocal.in
|
||||
@@ -1,6 +1,8 @@
|
||||
-#!@PERL@ -w
|
||||
+#!@PERL@
|
||||
# @configure_input@
|
||||
|
||||
+$^W = 1;
|
||||
+
|
||||
# Copyright (C) 2012-2017 Free Software Foundation, Inc.
|
||||
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
--- a/t/wrap/automake.in
|
||||
+++ b/t/wrap/automake.in
|
||||
@@ -1,6 +1,8 @@
|
||||
-#!@PERL@ -w
|
||||
+#!@PERL@
|
||||
# @configure_input@
|
||||
|
||||
+$^W = 1;
|
||||
+
|
||||
# Copyright (C) 2012-2017 Free Software Foundation, Inc.
|
||||
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# Override SHELL. This is required on DJGPP so that system() uses
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- a/bin/aclocal.in
|
||||
+++ b/bin/aclocal.in
|
||||
@@ -356,6 +356,12 @@ sub scan_m4_dirs ($$@)
|
||||
@@ -371,6 +371,12 @@ sub scan_m4_dirs ($$@)
|
||||
|
||||
foreach my $m4dir (@dirlist)
|
||||
{
|
||||
|
||||
29
tools/automake/patches/101-do-not-require-files.patch
Normal file
29
tools/automake/patches/101-do-not-require-files.patch
Normal file
@ -0,0 +1,29 @@
|
||||
--- a/bin/automake.in
|
||||
+++ b/bin/automake.in
|
||||
@@ -4513,7 +4513,7 @@ sub handle_gettext ()
|
||||
&& grep ($_ eq 'intl', @subdirs));
|
||||
}
|
||||
|
||||
- require_file ($ac_gettext_location, GNU, 'ABOUT-NLS');
|
||||
+ require_file ($ac_gettext_location, GNITS, 'ABOUT-NLS');
|
||||
}
|
||||
|
||||
# Emit makefile footer.
|
||||
@@ -5641,7 +5641,7 @@ sub check_gnu_standards ()
|
||||
# otherwise require non-.md.
|
||||
my $required
|
||||
= (! -f $file && -f "$file.md") ? "$file.md" : $file;
|
||||
- require_file ("$am_file.am", GNU, $required);
|
||||
+ require_file ("$am_file.am", GNITS, $required);
|
||||
}
|
||||
|
||||
# Accept one of these three licenses; default to COPYING.
|
||||
@@ -5655,7 +5655,7 @@ sub check_gnu_standards ()
|
||||
last;
|
||||
}
|
||||
}
|
||||
- require_file ("$am_file.am", GNU, 'COPYING')
|
||||
+ require_file ("$am_file.am", GNITS, 'COPYING')
|
||||
unless $license;
|
||||
}
|
||||
|
||||
@ -0,0 +1,59 @@
|
||||
From: Bogdan Drozdowski <bogdandr AT op.pl>
|
||||
Date: Sat, 31 Dec 2022 20:17:35 +0100
|
||||
Subject: [PATCH] Allow other V values for verbosity
|
||||
|
||||
---
|
||||
m4/silent.m4 | 2 +-
|
||||
t/silent-gen.sh | 24 ++++++++++++++++++++++++
|
||||
2 files changed, 25 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/m4/silent.m4
|
||||
+++ b/m4/silent.m4
|
||||
@@ -43,7 +43,7 @@ else
|
||||
fi])
|
||||
if test $am_cv_make_support_nested_variables = yes; then
|
||||
dnl Using '$V' instead of '$(V)' breaks IRIX make.
|
||||
- AM_V='$(V)'
|
||||
+ AM_V='$(shell if ( test "x$(V)" = "x0" ); then echo 0; elif ( test "x$(V)" = "x" ); then echo $(AM_DEFAULT_VERBOSITY); else echo 1; fi)'
|
||||
AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
|
||||
else
|
||||
AM_V=$AM_DEFAULT_VERBOSITY
|
||||
--- a/t/silent-gen.sh
|
||||
+++ b/t/silent-gen.sh
|
||||
@@ -54,6 +54,18 @@ grep 'cp ' stdout
|
||||
grep 'echo ' stdout
|
||||
|
||||
$MAKE clean
|
||||
+run_make -O V=99
|
||||
+grep 'GEN ' stdout && exit 1
|
||||
+grep 'cp ' stdout
|
||||
+grep 'echo ' stdout
|
||||
+
|
||||
+$MAKE clean
|
||||
+run_make -O V=vvv
|
||||
+grep 'GEN ' stdout && exit 1
|
||||
+grep 'cp ' stdout
|
||||
+grep 'echo ' stdout
|
||||
+
|
||||
+$MAKE clean
|
||||
run_make -O V=0
|
||||
grep 'GEN .*foo' stdout
|
||||
grep 'cp ' stdout && exit 1
|
||||
@@ -78,5 +90,17 @@ run_make -O V=1
|
||||
grep 'GEN ' stdout && exit 1
|
||||
grep 'cp ' stdout
|
||||
grep 'echo ' stdout
|
||||
+
|
||||
+$MAKE clean
|
||||
+run_make -O V=99
|
||||
+grep 'GEN ' stdout && exit 1
|
||||
+grep 'cp ' stdout
|
||||
+grep 'echo ' stdout
|
||||
+
|
||||
+$MAKE clean
|
||||
+run_make -O V=v
|
||||
+grep 'GEN ' stdout && exit 1
|
||||
+grep 'cp ' stdout
|
||||
+grep 'echo ' stdout
|
||||
|
||||
:
|
||||
Loading…
Reference in New Issue
Block a user