Signed-off-by: Marcel Lorenz marcel.lorenz@ipfire.org

--- config/rootfiles/common/automake | 245 +++++++++++++-------------- lfs/automake | 20 ++- src/patches/automake-1.15_perl_warning.patch | 10 ++ 3 files changed, 147 insertions(+), 128 deletions(-) create mode 100644 src/patches/automake-1.15_perl_warning.patch

diff --git a/config/rootfiles/common/automake b/config/rootfiles/common/automake index 0c19dc3..3568fe7 100644 --- a/config/rootfiles/common/automake +++ b/config/rootfiles/common/automake @@ -1,133 +1,130 @@ #usr/bin/aclocal -#usr/bin/aclocal-1.12 +#usr/bin/aclocal-1.15 #usr/bin/automake -#usr/bin/automake-1.12 -#usr/share/aclocal-1.12 -#usr/share/aclocal-1.12/amversion.m4 -#usr/share/aclocal-1.12/ar-lib.m4 -#usr/share/aclocal-1.12/as.m4 -#usr/share/aclocal-1.12/auxdir.m4 -#usr/share/aclocal-1.12/ccstdc.m4 -#usr/share/aclocal-1.12/cond-if.m4 -#usr/share/aclocal-1.12/cond.m4 -#usr/share/aclocal-1.12/depend.m4 -#usr/share/aclocal-1.12/depout.m4 -#usr/share/aclocal-1.12/dmalloc.m4 -#usr/share/aclocal-1.12/gcj.m4 -#usr/share/aclocal-1.12/header.m4 -#usr/share/aclocal-1.12/init.m4 -#usr/share/aclocal-1.12/install-sh.m4 -#usr/share/aclocal-1.12/lead-dot.m4 -#usr/share/aclocal-1.12/lex.m4 -#usr/share/aclocal-1.12/lispdir.m4 -#usr/share/aclocal-1.12/maintainer.m4 -#usr/share/aclocal-1.12/make.m4 -#usr/share/aclocal-1.12/minuso.m4 -#usr/share/aclocal-1.12/missing.m4 -#usr/share/aclocal-1.12/mkdirp.m4 -#usr/share/aclocal-1.12/obsol-gt.m4 -#usr/share/aclocal-1.12/obsol-lt.m4 -#usr/share/aclocal-1.12/obsolete.m4 -#usr/share/aclocal-1.12/options.m4 -#usr/share/aclocal-1.12/protos.m4 -#usr/share/aclocal-1.12/python.m4 -#usr/share/aclocal-1.12/runlog.m4 -#usr/share/aclocal-1.12/sanity.m4 -#usr/share/aclocal-1.12/silent.m4 -#usr/share/aclocal-1.12/strip.m4 -#usr/share/aclocal-1.12/substnot.m4 -#usr/share/aclocal-1.12/tar.m4 -#usr/share/aclocal-1.12/upc.m4 -#usr/share/aclocal-1.12/vala.m4 +#usr/bin/automake-1.15 +#usr/share/aclocal +#usr/share/aclocal-1.15 +#usr/share/aclocal-1.15/amversion.m4 +#usr/share/aclocal-1.15/ar-lib.m4 +#usr/share/aclocal-1.15/as.m4 +#usr/share/aclocal-1.15/auxdir.m4 +#usr/share/aclocal-1.15/cond-if.m4 +#usr/share/aclocal-1.15/cond.m4 +#usr/share/aclocal-1.15/depend.m4 +#usr/share/aclocal-1.15/depout.m4 +#usr/share/aclocal-1.15/dmalloc.m4 +#usr/share/aclocal-1.15/extra-recurs.m4 +#usr/share/aclocal-1.15/gcj.m4 +#usr/share/aclocal-1.15/init.m4 +#usr/share/aclocal-1.15/install-sh.m4 +#usr/share/aclocal-1.15/internal +#usr/share/aclocal-1.15/internal/ac-config-macro-dirs.m4 +#usr/share/aclocal-1.15/lead-dot.m4 +#usr/share/aclocal-1.15/lex.m4 +#usr/share/aclocal-1.15/lispdir.m4 +#usr/share/aclocal-1.15/maintainer.m4 +#usr/share/aclocal-1.15/make.m4 +#usr/share/aclocal-1.15/missing.m4 +#usr/share/aclocal-1.15/mkdirp.m4 +#usr/share/aclocal-1.15/obsolete.m4 +#usr/share/aclocal-1.15/options.m4 +#usr/share/aclocal-1.15/prog-cc-c-o.m4 +#usr/share/aclocal-1.15/python.m4 +#usr/share/aclocal-1.15/runlog.m4 +#usr/share/aclocal-1.15/sanity.m4 +#usr/share/aclocal-1.15/silent.m4 +#usr/share/aclocal-1.15/strip.m4 +#usr/share/aclocal-1.15/substnot.m4 +#usr/share/aclocal-1.15/tar.m4 +#usr/share/aclocal-1.15/upc.m4 +#usr/share/aclocal-1.15/vala.m4 #usr/share/aclocal/README -#usr/share/automake-1.12 -#usr/share/automake-1.12/Automake -#usr/share/automake-1.12/Automake/ChannelDefs.pm -#usr/share/automake-1.12/Automake/Channels.pm -#usr/share/automake-1.12/Automake/Condition.pm -#usr/share/automake-1.12/Automake/Config.pm -#usr/share/automake-1.12/Automake/Configure_ac.pm -#usr/share/automake-1.12/Automake/DisjConditions.pm -#usr/share/automake-1.12/Automake/FileUtils.pm -#usr/share/automake-1.12/Automake/General.pm -#usr/share/automake-1.12/Automake/Getopt.pm -#usr/share/automake-1.12/Automake/Item.pm -#usr/share/automake-1.12/Automake/ItemDef.pm -#usr/share/automake-1.12/Automake/Location.pm -#usr/share/automake-1.12/Automake/Options.pm -#usr/share/automake-1.12/Automake/Rule.pm -#usr/share/automake-1.12/Automake/RuleDef.pm -#usr/share/automake-1.12/Automake/VarDef.pm -#usr/share/automake-1.12/Automake/Variable.pm -#usr/share/automake-1.12/Automake/Version.pm -#usr/share/automake-1.12/Automake/Wrap.pm -#usr/share/automake-1.12/Automake/XFile.pm -#usr/share/automake-1.12/COPYING -#usr/share/automake-1.12/INSTALL -#usr/share/automake-1.12/am -#usr/share/automake-1.12/am/check.am -#usr/share/automake-1.12/am/check2.am -#usr/share/automake-1.12/am/clean-hdr.am -#usr/share/automake-1.12/am/clean.am -#usr/share/automake-1.12/am/compile.am -#usr/share/automake-1.12/am/configure.am -#usr/share/automake-1.12/am/data.am -#usr/share/automake-1.12/am/dejagnu.am -#usr/share/automake-1.12/am/depend.am -#usr/share/automake-1.12/am/depend2.am -#usr/share/automake-1.12/am/distdir.am -#usr/share/automake-1.12/am/footer.am -#usr/share/automake-1.12/am/header-vars.am -#usr/share/automake-1.12/am/header.am -#usr/share/automake-1.12/am/inst-vars.am -#usr/share/automake-1.12/am/install.am -#usr/share/automake-1.12/am/java.am -#usr/share/automake-1.12/am/lang-compile.am -#usr/share/automake-1.12/am/lex.am -#usr/share/automake-1.12/am/library.am -#usr/share/automake-1.12/am/libs.am -#usr/share/automake-1.12/am/libtool.am -#usr/share/automake-1.12/am/lisp.am -#usr/share/automake-1.12/am/ltlib.am -#usr/share/automake-1.12/am/ltlibrary.am -#usr/share/automake-1.12/am/mans-vars.am -#usr/share/automake-1.12/am/mans.am -#usr/share/automake-1.12/am/program.am -#usr/share/automake-1.12/am/progs.am -#usr/share/automake-1.12/am/python.am -#usr/share/automake-1.12/am/remake-hdr.am -#usr/share/automake-1.12/am/scripts.am -#usr/share/automake-1.12/am/subdirs.am -#usr/share/automake-1.12/am/tags.am -#usr/share/automake-1.12/am/texi-vers.am -#usr/share/automake-1.12/am/texibuild.am -#usr/share/automake-1.12/am/texinfos.am -#usr/share/automake-1.12/am/vala.am -#usr/share/automake-1.12/am/yacc.am -#usr/share/automake-1.12/ar-lib -#usr/share/automake-1.12/compile -#usr/share/automake-1.12/config.guess -#usr/share/automake-1.12/config.sub -#usr/share/automake-1.12/depcomp -#usr/share/automake-1.12/elisp-comp -#usr/share/automake-1.12/install-sh -#usr/share/automake-1.12/mdate-sh -#usr/share/automake-1.12/missing -#usr/share/automake-1.12/mkinstalldirs -#usr/share/automake-1.12/py-compile -#usr/share/automake-1.12/tap-driver.pl -#usr/share/automake-1.12/tap-driver.sh -#usr/share/automake-1.12/test-driver -#usr/share/automake-1.12/texinfo.tex -#usr/share/automake-1.12/ylwrap -#usr/share/doc/automake -#usr/share/doc/automake/amhello-1.0.tar.gz +#usr/share/automake-1.15 +#usr/share/automake-1.15/Automake +#usr/share/automake-1.15/Automake/ChannelDefs.pm +#usr/share/automake-1.15/Automake/Channels.pm +#usr/share/automake-1.15/Automake/Condition.pm +#usr/share/automake-1.15/Automake/Config.pm +#usr/share/automake-1.15/Automake/Configure_ac.pm +#usr/share/automake-1.15/Automake/DisjConditions.pm +#usr/share/automake-1.15/Automake/FileUtils.pm +#usr/share/automake-1.15/Automake/General.pm +#usr/share/automake-1.15/Automake/Getopt.pm +#usr/share/automake-1.15/Automake/Item.pm +#usr/share/automake-1.15/Automake/ItemDef.pm +#usr/share/automake-1.15/Automake/Language.pm +#usr/share/automake-1.15/Automake/Location.pm +#usr/share/automake-1.15/Automake/Options.pm +#usr/share/automake-1.15/Automake/Rule.pm +#usr/share/automake-1.15/Automake/RuleDef.pm +#usr/share/automake-1.15/Automake/VarDef.pm +#usr/share/automake-1.15/Automake/Variable.pm +#usr/share/automake-1.15/Automake/Version.pm +#usr/share/automake-1.15/Automake/Wrap.pm +#usr/share/automake-1.15/Automake/XFile.pm +#usr/share/automake-1.15/COPYING +#usr/share/automake-1.15/INSTALL +#usr/share/automake-1.15/am +#usr/share/automake-1.15/am/check.am +#usr/share/automake-1.15/am/check2.am +#usr/share/automake-1.15/am/clean-hdr.am +#usr/share/automake-1.15/am/clean.am +#usr/share/automake-1.15/am/compile.am +#usr/share/automake-1.15/am/configure.am +#usr/share/automake-1.15/am/data.am +#usr/share/automake-1.15/am/dejagnu.am +#usr/share/automake-1.15/am/depend.am +#usr/share/automake-1.15/am/depend2.am +#usr/share/automake-1.15/am/distdir.am +#usr/share/automake-1.15/am/footer.am +#usr/share/automake-1.15/am/header-vars.am +#usr/share/automake-1.15/am/header.am +#usr/share/automake-1.15/am/inst-vars.am +#usr/share/automake-1.15/am/install.am +#usr/share/automake-1.15/am/java.am +#usr/share/automake-1.15/am/lang-compile.am +#usr/share/automake-1.15/am/lex.am +#usr/share/automake-1.15/am/library.am +#usr/share/automake-1.15/am/libs.am +#usr/share/automake-1.15/am/libtool.am +#usr/share/automake-1.15/am/lisp.am +#usr/share/automake-1.15/am/ltlib.am +#usr/share/automake-1.15/am/ltlibrary.am +#usr/share/automake-1.15/am/mans-vars.am +#usr/share/automake-1.15/am/mans.am +#usr/share/automake-1.15/am/program.am +#usr/share/automake-1.15/am/progs.am +#usr/share/automake-1.15/am/python.am +#usr/share/automake-1.15/am/remake-hdr.am +#usr/share/automake-1.15/am/scripts.am +#usr/share/automake-1.15/am/subdirs.am +#usr/share/automake-1.15/am/tags.am +#usr/share/automake-1.15/am/texi-vers.am +#usr/share/automake-1.15/am/texibuild.am +#usr/share/automake-1.15/am/texinfos.am +#usr/share/automake-1.15/am/vala.am +#usr/share/automake-1.15/am/yacc.am +#usr/share/automake-1.15/ar-lib +#usr/share/automake-1.15/compile +#usr/share/automake-1.15/config.guess +#usr/share/automake-1.15/config.sub +#usr/share/automake-1.15/depcomp +#usr/share/automake-1.15/install-sh +#usr/share/automake-1.15/mdate-sh +#usr/share/automake-1.15/missing +#usr/share/automake-1.15/mkinstalldirs +#usr/share/automake-1.15/py-compile +#usr/share/automake-1.15/tap-driver.sh +#usr/share/automake-1.15/test-driver +#usr/share/automake-1.15/texinfo.tex +#usr/share/automake-1.15/ylwrap +#usr/share/doc/automake-1.15 +#usr/share/doc/automake-1.15/amhello-1.0.tar.gz #usr/share/info/automake-history.info #usr/share/info/automake.info #usr/share/info/automake.info-1 #usr/share/info/automake.info-2 -#usr/share/info/automake.info-3 -#usr/share/man/man1/aclocal-1.12.1 +#usr/share/man/man1/aclocal-1.15.1 #usr/share/man/man1/aclocal.1 -#usr/share/man/man1/automake-1.12.1 +#usr/share/man/man1/automake-1.15.1 #usr/share/man/man1/automake.1 diff --git a/lfs/automake b/lfs/automake index 9b19a1b..a372443 100644 --- a/lfs/automake +++ b/lfs/automake @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2016 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@

include Config

-VER = 1.12.4 +VER = 1.15

THISAPP = automake-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,6 +32,16 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)

+# Normal build or /tools build. +# +ifeq "$(ROOT)" "" + PREFIX = /usr + TARGET = $(DIR_INFO)/$(THISAPP) +else + PREFIX = /tools + TARGET = $(DIR_INFO)/$(THISAPP)-tools +endif + ############################################################################### # Top-level Rules ############################################################################### @@ -40,7 +50,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 7395a0420ecb5c9bc43e5fcf4824df36 +$(DL_FILE)_MD5 = 9a1ddb0e053474d9d1105cfe39b0c48d

install : $(TARGET)

@@ -70,7 +80,9 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/automake-1.15_perl_warning.patch + cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --disable-nls \ + --docdir=/usr/share/doc/automake-1.15 cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/src/patches/automake-1.15_perl_warning.patch b/src/patches/automake-1.15_perl_warning.patch new file mode 100644 index 0000000..9a031e8 --- /dev/null +++ b/src/patches/automake-1.15_perl_warning.patch @@ -0,0 +1,10 @@ +--- automake-1.15/bin/automake.in ++++ automake-1.15/bin/automake.in +@@ -3878,7 +3878,7 @@ + sub substitute_ac_subst_variables + { + my ($text) = @_; +- $text =~ s/${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge; ++ $text =~ s/${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge; + return $text; + }