forked from pool/automake
- Update to 1.15:
New in 1.15:
* Improvements and refactorings in the install-sh script:
- It has been modernized, and now makes the following assumptions
*unconditionally*:
(1) a working 'dirname' program is available;
(2) the ${var:-value} shell parameters substitution works;
(3) the "set -f" and "set +f" shell commands work, and, respectively,
disable and enable shell globbing.
- The script implements stricter error checking, and now it complains
and bails out if any of the following expectations is not met:
(1) the options -d and -t are never used together;
(2) the argument passed to option -t is a directory;
(3) if there are two or more SOURCEFILE arguments, the
DESTINATION argument must be a directory.
* Automake-generated testsuites:
- The default test-driver used by the Automake-generates testsuites
now appends the result and exit status of each "plain" test to the
associated log file (automake bug#11814).
- The perl implementation of the TAP testsuite driver is no longer
installed in the Automake's scripts directory, and is instead just
distributed as a "contrib" addition. There should be no reason to
use this implementation anyway in real packages, since the awk+shell
implementation of the TAP driver (which is documented in the manual)
is more portable and has feature parity with the perl implementation.
- The rule generating 'test-suite.log' no longer risk incurring in an
extra useless "make all" recursive invocation in some corner cases
(automake bug#16302).
* Distribution:
- Automake bug#18286: "make distcheck" could sometimes fail to detect
files missing from the distribution tarball, especially in those cases
where both the generated files and their dependencies are explicitly
in $(srcdir). An important example of this are *generated* makefile
fragments included at Automake time in Makefile.am; e.g.:
...
$(srcdir)/fragment.am: $(srcdir)/data.txt $(srcdir)/preproc.sh
cd $(srcdir) && $(SHELL) preproc.sh <data.txt >fragment.am
include $(srcdir)/fragment.am
...
If the use forgot to add data.txt and/or preproc.sh in the distribution
tarball, "make distcheck" would have erroneously succeeded! This issue
is now fixed.
- As a consequence of the previous change, "make distcheck" will run
using '$(distdir)/_build/sub' as the build directory, rather than
simply '$(distdir)/_build' (as it was the case for Automake 1.14 and
earlier). Consequently, the './configure' and 'make' invocations
issued by the distcheck recipe now have $(srcdir) equal to '../..',
rather than to just '..'. Dependent and similar variables (e.g.,
'$(top_srcdir)') are also changed accordingly.
Thus, Makefiles that made assumptions about the exact values of the
build and source directories used by "make distcheck" will have to
be adjusted. Notice that making such assumptions was a bad and
unsupported practice anyway, since the exact locations of those
directories should be considered implementation details, and we
reserve the right to change them at any time.
* Miscellaneous bugs fixed:
- The expansion of AM_INIT_AUTOMAKE ends once again with a trailing
newline (bug#16841). Regression introduced in Automake 1.14.
- We no longer risk to use '$ac_aux_dir' before it's defined (see
automake bug#15981). Bug introduced in Automake 1.14.
- The code used to detect whether the currently used make is GNU make
or not (relying on the private macro 'am__is_gnu_make') no longer
risks causing "Arg list too long" for projects using automatic
dependency tracking and having a ton of source files (bug#18744).
- Automake tries to offer a more deterministic output for generated
Makefiles, in the face of the newly-introduced randomization for
hash keys order in Perl 5.18.
- In older Automake versions, if a user defined one single Makefile
fragment (say 'foo.am') to be included via Automake includes in
his main Makefile.am, and defined a custom make rule to generate that
file from other data, Automake used to spuriously complain with some
message like "... overrides Automake target '$(srcdir)/foo.am".
This bug is now fixed.
- The user can now extend the special .PRECIOUS target, the same way
he could already do with the .MAKE .and .PHONY targets.
- Some confusing typos have been fixed in the manual and in few warning
messages (automake bug#16827 and bug#16997).
- Remove automake-fix-ac_aux_dir-used-before-initialized.patch as the
change is incorporated now.
- Refresh automake-SuSE.patch and automake-require_file.patch so that
they apply cleanly.
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=46
This commit is contained in:
Philipp Thomas
Git OBS Bridge
parent
6fc6cb3a33
commit
66e54df606
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a9b4f04b8b69cac2e832a38a718943aa976dbdad0097211f8b3448afdacf0669
|
||||
size 1488984
|
||||
@ -1,17 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1.4.15 (GNU/Linux)
|
||||
|
||||
iQIcBAABAgAGBQJSuYwUAAoJEPyBjhdCn5bq+YoP/3Mfg1rZyZk3ZvN7i3z1NBgy
|
||||
rv24o5Nbe76w3x9tijsrWcpNYa5yKjX7TYVkBTxG+OvoCN/ehcuCTsefAeTrpY37
|
||||
AVaOhsp2WEHtg+iGfSWqMKAORn2JBqPAtcU9wn4eaorl41+T//Ds0pHP2jUZsfRs
|
||||
hw3dbhLCv41qzT/7hqk1KUmuDYz8A3lUaIhpkj7oIc7lwAcqbO62e6UH+DXMr0gg
|
||||
AnPIW6CKg3cFpBDVl80XybzMVcqhb/QzhnofCw5yB0s0tW5bdPyoaO27HCoBxNal
|
||||
7eABHtQrbXlZeNNQNGtDdZqzkPt/hwbTlraAkqed3xg1yYGkpKeeyfeeLhgRz7/X
|
||||
4QJd70iXS3KmVrmoAhe69sOlOR0JRtoiZts/MCKNN0cR/USmAsTHi4ovIKDxluU3
|
||||
/gixFadgqwA3ZLdUiNjgFaRTJOEX0gCGSygJWwoTGS8bDcs27SanXJ7zzs6pmG2R
|
||||
TSbWm9j7FoBqA7gdRPmESVRNUvmNhB7STNhRz1Ia9bYo7qEM7oB66oSqr9Q4Ehee
|
||||
S18hSVIoN09b/nPXJPMHq9NxzCcPbhGrMeFMZpP3e5jNT2mo9pQVSFSUn1nlL1Aj
|
||||
yya6JpAEMHq++S/N+wXtQvjK3sq3U6wOSDiO/2JNfpynyssr+U5U3cr13CPzN8gc
|
||||
+Ywgvm6rTrvZtX2R8yOS
|
||||
=eTWq
|
||||
-----END PGP SIGNATURE-----
|
||||
3
automake-1.15.tar.xz
Normal file
3
automake-1.15.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9908c75aabd49d13661d6dcb1bc382252d22cc77bf733a2d55e87f2aa2db8636
|
||||
size 1496708
|
||||
17
automake-1.15.tar.xz.sig
Normal file
17
automake-1.15.tar.xz.sig
Normal file
@ -0,0 +1,17 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1
|
||||
|
||||
iQIcBAABAgAGBQJUqvOBAAoJEGD5BgFuQHVzYZQQAJYMBz2jCteP1zjK+uyrCU0C
|
||||
i5dPlkoC/SoQhedrsTJ7lXK7Fr0kGy9fARxfMGX9eXtXXb0B4rbJIbcZglDpJo7r
|
||||
GlOLsFL1b6/jC8+36rR7MUdbRzPjmdEQjujXDL7H7z5LeuNMfuHuN/+9ihfxsq98
|
||||
Xcuf94y9CWPQaEe+vhn+yPNT5wDwSPNN3dfyLgvLx3sw70z4d5wZMb5kLsb32yfU
|
||||
9MGgsA/jZFxazGEx2XkNESqNu07v3cYIibmdJE/yix9SGrK+1FY+fsNG2IjFhDFT
|
||||
aqyPTepWfSF2Be6COGyuLX9NMZY5UMWJlt4ArmWUgzfmFXcOYlRzWH3NmZLgmg8F
|
||||
XvmmiwZeBPvkqSWi4bEDTqWIGboC6gHrKgVL0/vDkRTkWc5WqqiiUirqyfiAcDzX
|
||||
qJq1sPoT3/+z9uVqZFQWb0Zv7ZciZJYyXHOep1vSuT2iCUXAso/6P4tAx96LC/mi
|
||||
oxh+s+jqyDCDcY2QMGq8S1U/13JKJdeYMtjqVNHrFMsql5h8Oxae6VgOlE7OwlWV
|
||||
EG04e0ZNTI8uHdvWm2uesGT/X1CHd/csT7dYfboMqynwBYcCPTbMgVVBcWJgT5ab
|
||||
PZtooJ7DC35micGjKoodTlhv02P2/UIFRtx9RJaySiAh3cgY6CR9fEvk5Ip9tYrC
|
||||
oiLElVyySwNVAaqS80zW
|
||||
=dcMt
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
Index: lib/config.guess
|
||||
===================================================================
|
||||
--- lib/config.guess.orig 2013-06-14 14:32:52.000000000 +0200
|
||||
+++ lib/config.guess 2013-06-17 13:43:12.656255639 +0200
|
||||
--- lib/config.guess.orig 2015-02-10 12:01:47.557016290 +0100
|
||||
+++ lib/config.guess 2015-02-10 12:05:32.791670816 +0100
|
||||
@@ -153,6 +153,16 @@ Linux|GNU|GNU/*)
|
||||
;;
|
||||
esac
|
||||
@ -88,7 +88,7 @@ Index: lib/config.guess
|
||||
exit ;;
|
||||
m68k:machten:*:*)
|
||||
echo m68k-apple-machten${UNAME_RELEASE}
|
||||
@@ -741,9 +751,9 @@ EOF
|
||||
@@ -742,9 +752,9 @@ EOF
|
||||
exit ;;
|
||||
i*86:OSF1:*:*)
|
||||
if [ -x /usr/sbin/sysversion ] ; then
|
||||
@ -100,7 +100,7 @@ Index: lib/config.guess
|
||||
fi
|
||||
exit ;;
|
||||
parisc*:Lites*:*:*)
|
||||
@@ -803,18 +813,18 @@ EOF
|
||||
@@ -804,18 +814,18 @@ EOF
|
||||
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
|
||||
exit ;;
|
||||
sparc*:BSD/OS:*:*)
|
||||
@ -123,7 +123,7 @@ Index: lib/config.guess
|
||||
esac
|
||||
exit ;;
|
||||
i*:CYGWIN*:*)
|
||||
@@ -842,10 +852,10 @@ EOF
|
||||
@@ -843,10 +853,10 @@ EOF
|
||||
echo i586-pc-interix${UNAME_RELEASE}
|
||||
exit ;;
|
||||
authenticamd | genuineintel | EM64T)
|
||||
@ -136,7 +136,7 @@ Index: lib/config.guess
|
||||
exit ;;
|
||||
esac ;;
|
||||
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
|
||||
@@ -864,31 +874,31 @@ EOF
|
||||
@@ -865,31 +875,31 @@ EOF
|
||||
echo ${UNAME_MACHINE}-pc-uwin
|
||||
exit ;;
|
||||
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
|
||||
@ -175,7 +175,7 @@ Index: lib/config.guess
|
||||
exit ;;
|
||||
alpha:Linux:*:*)
|
||||
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
|
||||
@@ -902,29 +912,29 @@ EOF
|
||||
@@ -903,29 +913,29 @@ EOF
|
||||
esac
|
||||
objdump --private-headers /bin/sh | grep -q ld.so.1
|
||||
if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
|
||||
@ -211,7 +211,7 @@ Index: lib/config.guess
|
||||
exit ;;
|
||||
cris:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-axis-linux-${LIBC}
|
||||
@@ -933,22 +943,22 @@ EOF
|
||||
@@ -934,22 +944,22 @@ EOF
|
||||
echo ${UNAME_MACHINE}-axis-linux-${LIBC}
|
||||
exit ;;
|
||||
frv:Linux:*:*)
|
||||
@ -239,18 +239,18 @@ Index: lib/config.guess
|
||||
exit ;;
|
||||
mips:Linux:*:* | mips64:Linux:*:*)
|
||||
eval $set_cc_for_build
|
||||
@@ -967,63 +977,63 @@ EOF
|
||||
@@ -968,63 +978,63 @@ EOF
|
||||
#endif
|
||||
EOF
|
||||
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
|
||||
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
|
||||
+ test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-${LIBC}"; exit; }
|
||||
;;
|
||||
or1k:Linux:*:*)
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
|
||||
openrisc*:Linux:*:*)
|
||||
- echo or1k-unknown-linux-${LIBC}
|
||||
+ echo or1k-${VENDOR}-linux-${LIBC}
|
||||
exit ;;
|
||||
or32:Linux:*:*)
|
||||
or32:Linux:*:* | or1k*:Linux:*:*)
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
|
||||
exit ;;
|
||||
@ -321,7 +321,7 @@ Index: lib/config.guess
|
||||
exit ;;
|
||||
i*86:DYNIX/ptx:4*:*)
|
||||
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
|
||||
@@ -1045,16 +1055,16 @@ EOF
|
||||
@@ -1046,16 +1056,16 @@ EOF
|
||||
echo ${UNAME_MACHINE}-pc-os2-emx
|
||||
exit ;;
|
||||
i*86:XTS-300:*:STOP)
|
||||
@ -341,7 +341,7 @@ Index: lib/config.guess
|
||||
exit ;;
|
||||
i*86:*DOS:*:*)
|
||||
echo ${UNAME_MACHINE}-pc-msdosdjgpp
|
||||
@@ -1074,7 +1084,7 @@ EOF
|
||||
@@ -1075,7 +1085,7 @@ EOF
|
||||
*Pentium) UNAME_MACHINE=i586 ;;
|
||||
*Pent*|*Celeron) UNAME_MACHINE=i686 ;;
|
||||
esac
|
||||
@ -350,7 +350,7 @@ Index: lib/config.guess
|
||||
exit ;;
|
||||
i*86:*:3.2:*)
|
||||
if test -f /usr/options/cb.name; then
|
||||
@@ -1113,7 +1123,7 @@ EOF
|
||||
@@ -1114,7 +1124,7 @@ EOF
|
||||
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
|
||||
echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
|
||||
else # Add other i860-SVR4 vendors below as they are discovered.
|
||||
@ -359,7 +359,7 @@ Index: lib/config.guess
|
||||
fi
|
||||
exit ;;
|
||||
mini*:CTIX:SYS*5:*)
|
||||
@@ -1150,19 +1160,19 @@ EOF
|
||||
@@ -1151,19 +1161,19 @@ EOF
|
||||
/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
|
||||
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
|
||||
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
|
||||
@ -383,7 +383,7 @@ Index: lib/config.guess
|
||||
exit ;;
|
||||
SM[BE]S:UNIX_SV:*:*)
|
||||
echo mips-dde-sysv${UNAME_RELEASE}
|
||||
@@ -1212,7 +1222,7 @@ EOF
|
||||
@@ -1213,7 +1223,7 @@ EOF
|
||||
if [ -d /usr/nec ]; then
|
||||
echo mips-nec-sysv${UNAME_RELEASE}
|
||||
else
|
||||
@ -392,7 +392,7 @@ Index: lib/config.guess
|
||||
fi
|
||||
exit ;;
|
||||
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
|
||||
@@ -1228,7 +1238,7 @@ EOF
|
||||
@@ -1229,7 +1239,7 @@ EOF
|
||||
echo i586-pc-haiku
|
||||
exit ;;
|
||||
x86_64:Haiku:*:*)
|
||||
@ -401,7 +401,7 @@ Index: lib/config.guess
|
||||
exit ;;
|
||||
SX-4:SUPER-UX:*:*)
|
||||
echo sx4-nec-superux${UNAME_RELEASE}
|
||||
@@ -1311,13 +1321,13 @@ EOF
|
||||
@@ -1322,13 +1332,13 @@ EOF
|
||||
else
|
||||
UNAME_MACHINE="$cputype"
|
||||
fi
|
||||
@ -418,7 +418,7 @@ Index: lib/config.guess
|
||||
exit ;;
|
||||
KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
|
||||
echo pdp10-dec-tops20
|
||||
@@ -1326,16 +1336,16 @@ EOF
|
||||
@@ -1337,16 +1347,16 @@ EOF
|
||||
echo pdp10-xkl-tops20
|
||||
exit ;;
|
||||
*:TOPS-20:*:*)
|
||||
@ -438,7 +438,7 @@ Index: lib/config.guess
|
||||
exit ;;
|
||||
*:*VMS:*:*)
|
||||
UNAME_MACHINE=`(uname -p) 2>/dev/null`
|
||||
@@ -1357,7 +1367,7 @@ EOF
|
||||
@@ -1368,7 +1378,7 @@ EOF
|
||||
echo ${UNAME_MACHINE}-pc-aros
|
||||
exit ;;
|
||||
x86_64:VMkernel:*:*)
|
||||
|
||||
@ -1,188 +0,0 @@
|
||||
From 7bc592708cc65f30f8322c18624f48f19ffd726f Mon Sep 17 00:00:00 2001
|
||||
From: Stefano Lattarini <stefano.lattarini@gmail.com>
|
||||
Date: Mon, 21 Apr 2014 16:12:41 +0000
|
||||
Subject: init: ensure $ac_aux_dir is defined before being used
|
||||
|
||||
Since we use '$ac_aux_dir' to define '$am_aux_dir', we need
|
||||
to ensure the former has been initialized before we try to
|
||||
define the latter, otherwise the definition:
|
||||
|
||||
am_aux_dir=`cd $ac_aux_dir && pwd`
|
||||
|
||||
will set '$am_aux_dir' to '$HOME', likely causing weird and
|
||||
unexpected behaviours.
|
||||
|
||||
This change fixes automake bug#15981.
|
||||
|
||||
* m4/auxdir.m4 (AM_AUX_DIR_EXPAND): AC_REQUIRE expansion
|
||||
of 'AC_CONFIG_AUX_DIR_DEFAULT'. Fix redundant comment and
|
||||
AC_PREREQ, add extra quoting around '$ac_aux_dir'.
|
||||
* t/auxdir-pr15981.sh: New test.
|
||||
* t/auxdir-cc-pr15981.sh: Likewise.
|
||||
* t/list-of-tests.mk (handwritten_TESTS): Add them.
|
||||
* THANKS, NEWS: Update.
|
||||
* bin/automake.in: Fix a harmless typo in comments, that
|
||||
I happened to notice while writing this patch.
|
||||
|
||||
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
|
||||
---
|
||||
Index: automake-1.14.1/THANKS
|
||||
===================================================================
|
||||
--- automake-1.14.1.orig/THANKS
|
||||
+++ automake-1.14.1/THANKS
|
||||
@@ -315,6 +315,7 @@ Per Oyvind Hvidsten poeh@ent
|
||||
Peter Breitenlohner peb@mppmu.mpg.de
|
||||
Peter Eisentraut peter_e@gmx.net
|
||||
Peter Gavin pgavin@debaser.kicks-ass.org
|
||||
+Peter Hutterer peter.hutterer@who-t.net
|
||||
Peter Johansson trojkan@gmail.com
|
||||
Peter Mattis petm@scam.XCF.Berkeley.EDU
|
||||
Peter Muir iyhi@yahoo.com
|
||||
Index: automake-1.14.1/bin/automake.in
|
||||
===================================================================
|
||||
--- automake-1.14.1.orig/bin/automake.in
|
||||
+++ automake-1.14.1/bin/automake.in
|
||||
@@ -313,7 +313,7 @@ my $seen_ar = 0;
|
||||
# Location of AC_REQUIRE_AUX_FILE calls, indexed by their argument.
|
||||
my %required_aux_file = ();
|
||||
|
||||
-# Where AM_INIT_AUTOMAKE is called;
|
||||
+# Where AM_INIT_AUTOMAKE is called.
|
||||
my $seen_init_automake = 0;
|
||||
|
||||
# TRUE if we've seen AM_AUTOMAKE_VERSION.
|
||||
Index: automake-1.14.1/m4/auxdir.m4
|
||||
===================================================================
|
||||
--- automake-1.14.1.orig/m4/auxdir.m4
|
||||
+++ automake-1.14.1/m4/auxdir.m4
|
||||
@@ -45,8 +45,7 @@
|
||||
# configured tree to be moved without reconfiguration.
|
||||
|
||||
AC_DEFUN([AM_AUX_DIR_EXPAND],
|
||||
-[dnl Rely on autoconf to set up CDPATH properly.
|
||||
-AC_PREREQ([2.50])dnl
|
||||
-# expand $ac_aux_dir to an absolute path
|
||||
-am_aux_dir=`cd $ac_aux_dir && pwd`
|
||||
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
|
||||
+# Expand $ac_aux_dir to an absolute path.
|
||||
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
|
||||
])
|
||||
Index: automake-1.14.1/t/auxdir-cc-pr15981.sh
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ automake-1.14.1/t/auxdir-cc-pr15981.sh
|
||||
@@ -0,0 +1,57 @@
|
||||
+#! /bin/sh
|
||||
+# Copyright (C) 2014 Free Software Foundation, Inc.
|
||||
+#
|
||||
+# 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
|
||||
+# the Free Software Foundation; either version 2, or (at your option)
|
||||
+# any later version.
|
||||
+#
|
||||
+# This program is distributed in the hope that it will be useful,
|
||||
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+# GNU General Public License for more details.
|
||||
+#
|
||||
+# You should have received a copy of the GNU General Public License
|
||||
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
+
|
||||
+# Test automake bug#15981: automake 1.14 may use $ac_aux_dir
|
||||
+# before it is defined, leading to error messages such as:
|
||||
+# "/bin/sh: /home/david/missing: No such file or directory"
|
||||
+
|
||||
+required=cc
|
||||
+. test-init.sh
|
||||
+
|
||||
+cat > configure.ac <<END
|
||||
+AC_INIT([$me], [0.0])
|
||||
+AC_USE_SYSTEM_EXTENSIONS
|
||||
+AM_INIT_AUTOMAKE([1.11 foreign])
|
||||
+AC_CONFIG_FILES([Makefile])
|
||||
+AC_SUBST([MISSING])
|
||||
+AC_OUTPUT
|
||||
+test -n "\${MISSING}"
|
||||
+END
|
||||
+
|
||||
+echo 'int main (void) { return 0; }' > foo.c
|
||||
+
|
||||
+cat > Makefile.am <<'END'
|
||||
+bin_PROGRAMS = foo
|
||||
+
|
||||
+# Without quotes around '--help' and with an empty $(MISSING), make might
|
||||
+# strip the trailing '--', call Bash's 'help' builtin, and have this test
|
||||
+# succeed spuriously. Yes, that has happened in practice :-(
|
||||
+test:
|
||||
+ $(MISSING) '--help'
|
||||
+END
|
||||
+
|
||||
+$ACLOCAL
|
||||
+$AUTOCONF
|
||||
+$AUTOMAKE
|
||||
+
|
||||
+./configure 2>stderr || { cat stderr >&2; exit 1; }
|
||||
+cat stderr >&2
|
||||
+$FGREP "missing" stderr && exit 1
|
||||
+
|
||||
+$MAKE all
|
||||
+$MAKE test
|
||||
+
|
||||
+:
|
||||
Index: automake-1.14.1/t/auxdir-pr15981.sh
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ automake-1.14.1/t/auxdir-pr15981.sh
|
||||
@@ -0,0 +1,39 @@
|
||||
+#! /bin/sh
|
||||
+# Copyright (C) 2014 Free Software Foundation, Inc.
|
||||
+#
|
||||
+# 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
|
||||
+# the Free Software Foundation; either version 2, or (at your option)
|
||||
+# any later version.
|
||||
+#
|
||||
+# This program is distributed in the hope that it will be useful,
|
||||
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+# GNU General Public License for more details.
|
||||
+#
|
||||
+# You should have received a copy of the GNU General Public License
|
||||
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
+
|
||||
+# AM_AUX_DIR_EXPAND should ensure $ac_aux_dir is properly initialized.
|
||||
+# Issue revealed by related automake bug#15981.
|
||||
+
|
||||
+. test-init.sh
|
||||
+
|
||||
+cat > configure.ac <<'END'
|
||||
+AC_INIT([test], [0.0])
|
||||
+AM_AUX_DIR_EXPAND
|
||||
+printf '%s\n' "ac_aux_dir: '$ac_aux_dir'"
|
||||
+printf '%s\n' "am_aux_dir: '$am_aux_dir'"
|
||||
+test "$ac_aux_dir" = . || AS_EXIT([1])
|
||||
+test "$am_aux_dir" = "`pwd`" || AS_EXIT([1])
|
||||
+AS_EXIT([0])
|
||||
+END
|
||||
+
|
||||
+$ACLOCAL
|
||||
+$AUTOCONF
|
||||
+
|
||||
+test -f install-sh # sanity check
|
||||
+
|
||||
+./configure
|
||||
+
|
||||
+:
|
||||
Index: automake-1.14.1/t/list-of-tests.mk
|
||||
===================================================================
|
||||
--- automake-1.14.1.orig/t/list-of-tests.mk
|
||||
+++ automake-1.14.1/t/list-of-tests.mk
|
||||
@@ -116,6 +116,8 @@ t/aclocal-scan-configure-ac-pr319.sh \
|
||||
t/aclocal-serial.sh \
|
||||
t/aclocal-underquoted-defun.sh \
|
||||
t/aclocal-verbose-install.sh \
|
||||
+t/auxdir-pr15981.sh \
|
||||
+t/auxdir-cc-pr15981.sh \
|
||||
t/ac-output-old.tap \
|
||||
t/acsilent.sh \
|
||||
t/acsubst.sh \
|
||||
@ -1,12 +1,12 @@
|
||||
---
|
||||
automake.in | 4 +++-
|
||||
bin/automake.in | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
Index: automake.in
|
||||
Index: bin/automake.in
|
||||
===================================================================
|
||||
--- bin/automake.in.orig 2013-06-03 16:18:00.000000000 +0200
|
||||
+++ bin/automake.in 2013-06-12 15:04:11.772901297 +0200
|
||||
@@ -7489,12 +7489,14 @@ sub required_file_check_or_copy ($$$)
|
||||
--- bin/automake.in.orig 2015-01-05 20:25:55.000000000 +0100
|
||||
+++ bin/automake.in 2015-02-10 12:06:26.983385721 +0100
|
||||
@@ -7389,12 +7389,14 @@ sub required_file_check_or_copy
|
||||
my $fullfile = "$dir/$file";
|
||||
my $found_it = 0;
|
||||
my $dangling_sym = 0;
|
||||
|
||||
@ -1,3 +1,110 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 10 11:37:28 CET 2015 - pth@suse.de
|
||||
|
||||
- Update to 1.15:
|
||||
New in 1.15:
|
||||
|
||||
* Improvements and refactorings in the install-sh script:
|
||||
|
||||
- It has been modernized, and now makes the following assumptions
|
||||
*unconditionally*:
|
||||
(1) a working 'dirname' program is available;
|
||||
(2) the ${var:-value} shell parameters substitution works;
|
||||
(3) the "set -f" and "set +f" shell commands work, and, respectively,
|
||||
disable and enable shell globbing.
|
||||
|
||||
- The script implements stricter error checking, and now it complains
|
||||
and bails out if any of the following expectations is not met:
|
||||
(1) the options -d and -t are never used together;
|
||||
(2) the argument passed to option -t is a directory;
|
||||
(3) if there are two or more SOURCEFILE arguments, the
|
||||
DESTINATION argument must be a directory.
|
||||
|
||||
* Automake-generated testsuites:
|
||||
|
||||
- The default test-driver used by the Automake-generates testsuites
|
||||
now appends the result and exit status of each "plain" test to the
|
||||
associated log file (automake bug#11814).
|
||||
|
||||
- The perl implementation of the TAP testsuite driver is no longer
|
||||
installed in the Automake's scripts directory, and is instead just
|
||||
distributed as a "contrib" addition. There should be no reason to
|
||||
use this implementation anyway in real packages, since the awk+shell
|
||||
implementation of the TAP driver (which is documented in the manual)
|
||||
is more portable and has feature parity with the perl implementation.
|
||||
|
||||
- The rule generating 'test-suite.log' no longer risk incurring in an
|
||||
extra useless "make all" recursive invocation in some corner cases
|
||||
(automake bug#16302).
|
||||
|
||||
* Distribution:
|
||||
|
||||
- Automake bug#18286: "make distcheck" could sometimes fail to detect
|
||||
files missing from the distribution tarball, especially in those cases
|
||||
where both the generated files and their dependencies are explicitly
|
||||
in $(srcdir). An important example of this are *generated* makefile
|
||||
fragments included at Automake time in Makefile.am; e.g.:
|
||||
|
||||
...
|
||||
$(srcdir)/fragment.am: $(srcdir)/data.txt $(srcdir)/preproc.sh
|
||||
cd $(srcdir) && $(SHELL) preproc.sh <data.txt >fragment.am
|
||||
include $(srcdir)/fragment.am
|
||||
...
|
||||
|
||||
If the use forgot to add data.txt and/or preproc.sh in the distribution
|
||||
tarball, "make distcheck" would have erroneously succeeded! This issue
|
||||
is now fixed.
|
||||
|
||||
- As a consequence of the previous change, "make distcheck" will run
|
||||
using '$(distdir)/_build/sub' as the build directory, rather than
|
||||
simply '$(distdir)/_build' (as it was the case for Automake 1.14 and
|
||||
earlier). Consequently, the './configure' and 'make' invocations
|
||||
issued by the distcheck recipe now have $(srcdir) equal to '../..',
|
||||
rather than to just '..'. Dependent and similar variables (e.g.,
|
||||
'$(top_srcdir)') are also changed accordingly.
|
||||
|
||||
Thus, Makefiles that made assumptions about the exact values of the
|
||||
build and source directories used by "make distcheck" will have to
|
||||
be adjusted. Notice that making such assumptions was a bad and
|
||||
unsupported practice anyway, since the exact locations of those
|
||||
directories should be considered implementation details, and we
|
||||
reserve the right to change them at any time.
|
||||
|
||||
* Miscellaneous bugs fixed:
|
||||
|
||||
- The expansion of AM_INIT_AUTOMAKE ends once again with a trailing
|
||||
newline (bug#16841). Regression introduced in Automake 1.14.
|
||||
|
||||
- We no longer risk to use '$ac_aux_dir' before it's defined (see
|
||||
automake bug#15981). Bug introduced in Automake 1.14.
|
||||
|
||||
- The code used to detect whether the currently used make is GNU make
|
||||
or not (relying on the private macro 'am__is_gnu_make') no longer
|
||||
risks causing "Arg list too long" for projects using automatic
|
||||
dependency tracking and having a ton of source files (bug#18744).
|
||||
|
||||
- Automake tries to offer a more deterministic output for generated
|
||||
Makefiles, in the face of the newly-introduced randomization for
|
||||
hash keys order in Perl 5.18.
|
||||
|
||||
- In older Automake versions, if a user defined one single Makefile
|
||||
fragment (say 'foo.am') to be included via Automake includes in
|
||||
his main Makefile.am, and defined a custom make rule to generate that
|
||||
file from other data, Automake used to spuriously complain with some
|
||||
message like "... overrides Automake target '$(srcdir)/foo.am".
|
||||
This bug is now fixed.
|
||||
|
||||
- The user can now extend the special .PRECIOUS target, the same way
|
||||
he could already do with the .MAKE .and .PHONY targets.
|
||||
|
||||
- Some confusing typos have been fixed in the manual and in few warning
|
||||
messages (automake bug#16827 and bug#16997).
|
||||
|
||||
- Remove automake-fix-ac_aux_dir-used-before-initialized.patch as the
|
||||
change is incorporated now.
|
||||
- Refresh automake-SuSE.patch and automake-require_file.patch so that
|
||||
they apply cleanly.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 6 07:08:18 UTC 2014 - gber@opensuse.org
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package automake-testsuite
|
||||
#
|
||||
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -21,7 +21,7 @@
|
||||
# aren't updated.
|
||||
|
||||
Name: automake-testsuite
|
||||
Version: 1.14.1
|
||||
Version: 1.15
|
||||
Release: 0
|
||||
Summary: A Program for Automatically Generating GNU-Style Makefile.in Files
|
||||
License: GPL-2.0+
|
||||
@ -33,7 +33,6 @@ Source2: http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz.sig
|
||||
Source3: automake-rpmlintrc
|
||||
Patch2: automake-require_file.patch
|
||||
Patch3: automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch
|
||||
Patch4: automake-fix-ac_aux_dir-used-before-initialized.patch
|
||||
Patch100: automake-SuSE.patch
|
||||
BuildArch: noarch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
@ -63,7 +62,6 @@ definitions (with rules occasionally thrown in). The generated
|
||||
%setup -q -n automake-%{version}
|
||||
%patch2
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch100
|
||||
|
||||
%build
|
||||
|
||||
107
automake.changes
107
automake.changes
@ -1,3 +1,110 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 10 11:37:28 CET 2015 - pth@suse.de
|
||||
|
||||
- Update to 1.15:
|
||||
New in 1.15:
|
||||
|
||||
* Improvements and refactorings in the install-sh script:
|
||||
|
||||
- It has been modernized, and now makes the following assumptions
|
||||
*unconditionally*:
|
||||
(1) a working 'dirname' program is available;
|
||||
(2) the ${var:-value} shell parameters substitution works;
|
||||
(3) the "set -f" and "set +f" shell commands work, and, respectively,
|
||||
disable and enable shell globbing.
|
||||
|
||||
- The script implements stricter error checking, and now it complains
|
||||
and bails out if any of the following expectations is not met:
|
||||
(1) the options -d and -t are never used together;
|
||||
(2) the argument passed to option -t is a directory;
|
||||
(3) if there are two or more SOURCEFILE arguments, the
|
||||
DESTINATION argument must be a directory.
|
||||
|
||||
* Automake-generated testsuites:
|
||||
|
||||
- The default test-driver used by the Automake-generates testsuites
|
||||
now appends the result and exit status of each "plain" test to the
|
||||
associated log file (automake bug#11814).
|
||||
|
||||
- The perl implementation of the TAP testsuite driver is no longer
|
||||
installed in the Automake's scripts directory, and is instead just
|
||||
distributed as a "contrib" addition. There should be no reason to
|
||||
use this implementation anyway in real packages, since the awk+shell
|
||||
implementation of the TAP driver (which is documented in the manual)
|
||||
is more portable and has feature parity with the perl implementation.
|
||||
|
||||
- The rule generating 'test-suite.log' no longer risk incurring in an
|
||||
extra useless "make all" recursive invocation in some corner cases
|
||||
(automake bug#16302).
|
||||
|
||||
* Distribution:
|
||||
|
||||
- Automake bug#18286: "make distcheck" could sometimes fail to detect
|
||||
files missing from the distribution tarball, especially in those cases
|
||||
where both the generated files and their dependencies are explicitly
|
||||
in $(srcdir). An important example of this are *generated* makefile
|
||||
fragments included at Automake time in Makefile.am; e.g.:
|
||||
|
||||
...
|
||||
$(srcdir)/fragment.am: $(srcdir)/data.txt $(srcdir)/preproc.sh
|
||||
cd $(srcdir) && $(SHELL) preproc.sh <data.txt >fragment.am
|
||||
include $(srcdir)/fragment.am
|
||||
...
|
||||
|
||||
If the use forgot to add data.txt and/or preproc.sh in the distribution
|
||||
tarball, "make distcheck" would have erroneously succeeded! This issue
|
||||
is now fixed.
|
||||
|
||||
- As a consequence of the previous change, "make distcheck" will run
|
||||
using '$(distdir)/_build/sub' as the build directory, rather than
|
||||
simply '$(distdir)/_build' (as it was the case for Automake 1.14 and
|
||||
earlier). Consequently, the './configure' and 'make' invocations
|
||||
issued by the distcheck recipe now have $(srcdir) equal to '../..',
|
||||
rather than to just '..'. Dependent and similar variables (e.g.,
|
||||
'$(top_srcdir)') are also changed accordingly.
|
||||
|
||||
Thus, Makefiles that made assumptions about the exact values of the
|
||||
build and source directories used by "make distcheck" will have to
|
||||
be adjusted. Notice that making such assumptions was a bad and
|
||||
unsupported practice anyway, since the exact locations of those
|
||||
directories should be considered implementation details, and we
|
||||
reserve the right to change them at any time.
|
||||
|
||||
* Miscellaneous bugs fixed:
|
||||
|
||||
- The expansion of AM_INIT_AUTOMAKE ends once again with a trailing
|
||||
newline (bug#16841). Regression introduced in Automake 1.14.
|
||||
|
||||
- We no longer risk to use '$ac_aux_dir' before it's defined (see
|
||||
automake bug#15981). Bug introduced in Automake 1.14.
|
||||
|
||||
- The code used to detect whether the currently used make is GNU make
|
||||
or not (relying on the private macro 'am__is_gnu_make') no longer
|
||||
risks causing "Arg list too long" for projects using automatic
|
||||
dependency tracking and having a ton of source files (bug#18744).
|
||||
|
||||
- Automake tries to offer a more deterministic output for generated
|
||||
Makefiles, in the face of the newly-introduced randomization for
|
||||
hash keys order in Perl 5.18.
|
||||
|
||||
- In older Automake versions, if a user defined one single Makefile
|
||||
fragment (say 'foo.am') to be included via Automake includes in
|
||||
his main Makefile.am, and defined a custom make rule to generate that
|
||||
file from other data, Automake used to spuriously complain with some
|
||||
message like "... overrides Automake target '$(srcdir)/foo.am".
|
||||
This bug is now fixed.
|
||||
|
||||
- The user can now extend the special .PRECIOUS target, the same way
|
||||
he could already do with the .MAKE .and .PHONY targets.
|
||||
|
||||
- Some confusing typos have been fixed in the manual and in few warning
|
||||
messages (automake bug#16827 and bug#16997).
|
||||
|
||||
- Remove automake-fix-ac_aux_dir-used-before-initialized.patch as the
|
||||
change is incorporated now.
|
||||
- Refresh automake-SuSE.patch and automake-require_file.patch so that
|
||||
they apply cleanly.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 6 07:08:18 UTC 2014 - gber@opensuse.org
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package automake
|
||||
#
|
||||
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -21,7 +21,7 @@
|
||||
# aren't updated.
|
||||
|
||||
Name: automake
|
||||
Version: 1.14.1
|
||||
Version: 1.15
|
||||
Release: 0
|
||||
Summary: A Program for Automatically Generating GNU-Style Makefile.in Files
|
||||
License: GPL-2.0+
|
||||
@ -33,7 +33,6 @@ Source2: http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz.sig
|
||||
Source3: automake-rpmlintrc
|
||||
Patch2: automake-require_file.patch
|
||||
Patch3: automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch
|
||||
Patch4: automake-fix-ac_aux_dir-used-before-initialized.patch
|
||||
Patch100: automake-SuSE.patch
|
||||
BuildArch: noarch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
@ -63,7 +62,6 @@ definitions (with rules occasionally thrown in). The generated
|
||||
%setup -q -n automake-%{version}
|
||||
%patch2
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch100
|
||||
|
||||
%build
|
||||
|
||||
Loading…
Reference in New Issue
Block a user