forked from pool/automake
2a3c7964ce
- 'install-sh' now ensures that nobody can cross privilege boundaries by pre-creating symlink on the directory inside "/tmp". - 'automake' does not depend on the 'none' subroutine of the List::Util module anymore to support older Perl version. (automake bug#30631) - A regression in AM_PYTHON_PATH causing the rejection of non literal minimum version parameter hasn't been fixed. (automake bug#30616) * Miscellaneous changes - When subdir-objects is in effect, Automake will now construct shorter object file names when no programs and libraries name clashes are encountered. This should make the discouraged use of 'foo_SHORTNAME' unnecessary in many cases. * Bugs fixed: - Automatic dependency tracking has been fixed to work also when the 'subdir-object' option is used and some 'foo_SOURCES' definition contains unexpanded references to make variables, as in, e.g.: a_src = sources/libs/aaa b_src = sources/bbb foo_SOURCES = $(a_src)/bar.c $(b_src)/baz.c With such a setup, the created makefile fragment containing dependency tracking information will be correctly placed under the directories named 'sources/libs/aaa/.deps' and 'sources/bbb/.deps', rather than mistakenly under directories named (literally!) '$(src_a)/.deps' and '$(src_b)/.deps' (this was the first part of automake bug#13928). Notice that in order to fix this bug we had to slightly change the semantics of how config.status bootstraps the makefile fragments required for the dependency tracking to work: rather than attempting to parse the Makefiles via grep and sed trickeries only, we actually invoke 'make' on a slightly preprocessed version of those Makefiles, using a private target that is only meant to bootstrap the required makefile fragments. OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=63
25 lines
779 B
Diff
25 lines
779 B
Diff
---
|
|
bin/automake.in | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
Index: automake-1.16.1/bin/automake.in
|
|
===================================================================
|
|
--- automake-1.16.1.orig/bin/automake.in 2018-03-08 21:27:05.000000000 +0100
|
|
+++ automake-1.16.1/bin/automake.in 2018-03-21 12:35:37.288053253 +0100
|
|
@@ -7540,12 +7540,14 @@ sub required_file_check_or_copy
|
|
my $fullfile = "$dir/$file";
|
|
my $found_it = 0;
|
|
my $dangling_sym = 0;
|
|
+ my $thisdir = dirname ($fullfile);
|
|
+ my $thisfile = basename ($fullfile);
|
|
|
|
if (-l $fullfile && ! -f $fullfile)
|
|
{
|
|
$dangling_sym = 1;
|
|
}
|
|
- elsif (dir_has_case_matching_file ($dir, $file))
|
|
+ elsif (dir_has_case_matching_file ($thisdir, $thisfile))
|
|
{
|
|
$found_it = 1;
|
|
}
|