From 5f2281d3e2851549596c780466ba3c3364246168 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Fri, 29 Jan 2021 14:22:18 +0000 Subject: [PATCH] autoconf: update to 2.71 update 2.69 (2012-04-24) to 2.71 (2021-01-28) release 2.70: https://lists.gnu.org/archive/html/autotools-announce/2020-12/msg00001.html release 2.71: https://lists.gnu.org/archive/html/autotools-announce/2021-01/msg00000.html news: https://git.savannah.gnu.org/cgit/autoconf.git/tree/NEWS --- packages/devel/autoconf/package.mk | 4 +- .../autoconf-0100-backport-runstatedir.patch | 59 ------------------ .../patches/autoconf-0200-performance.patch | 60 ------------------- .../patches/autoconf-autoreconf-exclude.patch | 56 +++++++++-------- .../devel/autoconf/patches/man-exclude.patch | 10 ++++ 5 files changed, 42 insertions(+), 147 deletions(-) delete mode 100644 packages/devel/autoconf/patches/autoconf-0100-backport-runstatedir.patch delete mode 100644 packages/devel/autoconf/patches/autoconf-0200-performance.patch create mode 100644 packages/devel/autoconf/patches/man-exclude.patch diff --git a/packages/devel/autoconf/package.mk b/packages/devel/autoconf/package.mk index 18172507ab..73397a8e96 100644 --- a/packages/devel/autoconf/package.mk +++ b/packages/devel/autoconf/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) PKG_NAME="autoconf" -PKG_VERSION="2.69" -PKG_SHA256="64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684" +PKG_VERSION="2.71" +PKG_SHA256="f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4" PKG_LICENSE="GPL" PKG_SITE="http://sources.redhat.com/autoconf/" PKG_URL="http://ftpmirror.gnu.org/autoconf/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/devel/autoconf/patches/autoconf-0100-backport-runstatedir.patch b/packages/devel/autoconf/patches/autoconf-0100-backport-runstatedir.patch deleted file mode 100644 index 37a03843aa..0000000000 --- a/packages/devel/autoconf/patches/autoconf-0100-backport-runstatedir.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 8e269b13bc042bc2504d5860e0d453b4aac32909 Mon Sep 17 00:00:00 2001 -From: Matthias Reichl -Date: Sun, 24 Jun 2018 13:45:26 +0200 -Subject: [PATCH] backport AC_INIT: add --runstatedir option to configure - -Backport of a197431414088a417b407b9b20583b2e8f7363bd. -Changes to NEWS and doc/autoconf.tex have been dropped. ---- - lib/autoconf/general.m4 | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 -index adfae1db..1437c0ca 100644 ---- a/lib/autoconf/general.m4 -+++ b/lib/autoconf/general.m4 -@@ -586,6 +586,7 @@ AC_SUBST([datadir], ['${datarootdir}'])dnl - AC_SUBST([sysconfdir], ['${prefix}/etc'])dnl - AC_SUBST([sharedstatedir], ['${prefix}/com'])dnl - AC_SUBST([localstatedir], ['${prefix}/var'])dnl -+AC_SUBST([runstatedir], ['${localstatedir}/run'])dnl - AC_SUBST([includedir], ['${prefix}/include'])dnl - AC_SUBST([oldincludedir], ['/usr/include'])dnl - AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME], -@@ -812,6 +813,15 @@ do - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - -+ -runstatedir | --runstatedir | --runstatedi | --runstated \ -+ | --runstate | --runstat | --runsta | --runst | --runs \ -+ | --run | --ru | --r) -+ ac_prev=runstatedir ;; -+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ -+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ -+ | --run=* | --ru=* | --r=*) -+ runstatedir=$ac_optarg ;; -+ - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -@@ -921,7 +931,7 @@ fi - for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ -- libdir localedir mandir -+ libdir localedir mandir runstatedir - do - eval ac_val=\$$ac_var - # Remove trailing slashes. -@@ -1058,6 +1068,7 @@ Fine tuning of the installation directories: - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] -+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] --- -2.11.0 - diff --git a/packages/devel/autoconf/patches/autoconf-0200-performance.patch b/packages/devel/autoconf/patches/autoconf-0200-performance.patch deleted file mode 100644 index 1842fe92b7..0000000000 --- a/packages/devel/autoconf/patches/autoconf-0200-performance.patch +++ /dev/null @@ -1,60 +0,0 @@ -The check for solaris 'print' causes significant problems on a linux machine -with dash as /bin/sh since it triggers the execution of "print" which on some -linux systems is a perl script which is part of mailcap. Worse, this perl -script calls "which file" and if successful ignores the path file was found -in and just runs "file" without a path. Each exection causes PATH to be searched. - -Simply assuming the shell's printf function works cuts out all the fork overhead -and when parallel tasks are running, this overhead appears to be significant. - -RP -2015/11/28 -Upstream-Status: Inappropriate - -Index: autoconf-2.69/lib/m4sugar/m4sh.m4 -=================================================================== ---- autoconf-2.69.orig/lib/m4sugar/m4sh.m4 -+++ autoconf-2.69/lib/m4sugar/m4sh.m4 -@@ -1045,40 +1045,8 @@ m4_defun([_AS_ECHO_PREPARE], - [[as_nl=' - ' - export as_nl --# Printing a long string crashes Solaris 7 /usr/bin/printf. --as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' --as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo --as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo --# Prefer a ksh shell builtin over an external printf program on Solaris, --# but without wasting forks for bash or zsh. --if test -z "$BASH_VERSION$ZSH_VERSION" \ -- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then -- as_echo='print -r --' -- as_echo_n='print -rn --' --elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -- as_echo='printf %s\n' -- as_echo_n='printf %s' --else -- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -- as_echo_body='eval /usr/ucb/echo -n "$][1$as_nl"' -- as_echo_n='/usr/ucb/echo -n' -- else -- as_echo_body='eval expr "X$][1" : "X\\(.*\\)"' -- as_echo_n_body='eval -- arg=$][1; -- case $arg in @%:@( -- *"$as_nl"*) -- expr "X$arg" : "X\\(.*\\)$as_nl"; -- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -- esac; -- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -- ' -- export as_echo_n_body -- as_echo_n='sh -c $as_echo_n_body as_echo' -- fi -- export as_echo_body -- as_echo='sh -c $as_echo_body as_echo' --fi -+as_echo='printf %s\n' -+as_echo_n='printf %s' - ]])# _AS_ECHO_PREPARE - - diff --git a/packages/devel/autoconf/patches/autoconf-autoreconf-exclude.patch b/packages/devel/autoconf/patches/autoconf-autoreconf-exclude.patch index d1bd3a2a31..f3f239cbc3 100644 --- a/packages/devel/autoconf/patches/autoconf-autoreconf-exclude.patch +++ b/packages/devel/autoconf/patches/autoconf-autoreconf-exclude.patch @@ -43,39 +43,30 @@ Index: autoconf-2.63/bin/autoreconf.in # Even if the user specified a configure.ac, trim to get the # directory, and look for configure.ac again. Because (i) the code # is simpler, and (ii) we are still able to diagnose simultaneous -@@ -255,6 +266,11 @@ - { - my ($aclocal, $flags) = @_; - -+ @ex = grep (/^aclocal$/, @exclude); -+ if ($#ex != -1) { -+ return; -+ } -+ - # aclocal 1.8+ does all this for free. It can be recognized by its - # --force support. - if ($aclocal_supports_force) @@ -368,7 +384,10 @@ } else { -- xsystem_hint ("autopoint is needed because this package uses Gettext", "$autopoint"); +- xsystem_hint ("autopoint is needed because this package uses Gettext", +- $autopoint); + @ex = grep (/^autopoint$/, @exclude); + if ($#ex == -1) { -+ xsystem_hint ("autopoint is needed because this package uses Gettext", "$autopoint"); ++ xsystem_hint ("autopoint is needed because this package uses Gettext", ++ $autopoint); + } } - -@@ -532,16 +551,17 @@ +@@ -532,16 +551,19 @@ { $libtoolize .= " --ltdl"; } -- xsystem_hint ("libtoolize is needed because this package uses Libtool", $libtoolize); +- xsystem_hint ("libtoolize is needed because this package uses Libtool", +- $libtoolize); - $rerun_aclocal = 1; + @ex = grep (/^libtoolize$/, @exclude); + if ($#ex == -1) { -+ xsystem_hint ("libtoolize is needed because this package uses Libtool", $libtoolize); ++ xsystem_hint ("libtoolize is needed because this package uses Libtool", ++ $libtoolize); + $rerun_aclocal = 1; + } } @@ -84,11 +75,24 @@ Index: autoconf-2.63/bin/autoreconf.in verb "$configure_ac: not running libtoolize: --install not given"; } -- -- - # ------------------- # - # Rerunning aclocal. # - # ------------------- # + + # --------------------- # + # Running intltoolize. # + # --------------------- # +@@ -748,8 +748,11 @@ + } + elsif ($install) + { +- xsystem_hint ("gtkdocize is needed because this package uses Gtkdoc", +- $gtkdocize); ++ @ex = grep (/^autopoint$/, @exclude); ++ if ($#ex == -1) { ++ xsystem_hint ("gtkdocize is needed because this package uses Gtkdoc", ++ $gtkdocize); ++ } + } + else + { @@ -572,7 +592,10 @@ # latter runs the former, and (ii) autoconf is stricter than # autoheader. So all in all, autoconf should give better error @@ -115,8 +119,8 @@ Index: autoconf-2.63/bin/autoreconf.in @@ -610,7 +636,10 @@ # We should always run automake, and let it decide whether it shall - # update the file or not. In fact, the effect of `$force' is already - # included in `$automake' via `--no-force'. + # update the file or not. In fact, the effect of '$force' is already + # included in '$automake' via '--no-force'. - xsystem ($automake); + @ex = grep (/^automake$/, @exclude); + if ($#ex == -1) { @@ -124,7 +128,7 @@ Index: autoconf-2.63/bin/autoreconf.in + } } - + # ---------------------------------------------------- # @@ -634,7 +663,10 @@ } else diff --git a/packages/devel/autoconf/patches/man-exclude.patch b/packages/devel/autoconf/patches/man-exclude.patch new file mode 100644 index 0000000000..55e77ba0ad --- /dev/null +++ b/packages/devel/autoconf/patches/man-exclude.patch @@ -0,0 +1,10 @@ +--- a/Makefile.in 2021-02-28 12:25:11.000000000 +0000 ++++ b/Makefile.in 2021-02-28 12:25:11.000000000 +0000 +@@ -780,7 +780,6 @@ + man/autoconf.1 \ + man/autoheader.1 \ + man/autom4te.1 \ +- man/autoreconf.1 \ + man/autoscan.1 \ + man/autoupdate.1 \ + man/ifnames.1