diff options
Diffstat (limited to 'meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch')
-rw-r--r-- | meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch b/meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch new file mode 100644 index 0000000000..2c6594f523 --- /dev/null +++ b/meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | Set relative to top_builddir path in Makefile to access test-driver | ||
2 | |||
3 | Signed-off-by: Adrian Calianu <adrian.calianu@enea.com> | ||
4 | Upstream-Status: Pending | ||
5 | Bug-Report: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19042 | ||
6 | |||
7 | --- a/bin/automake.in | ||
8 | +++ b/bin/automake.in | ||
9 | @@ -272,6 +272,9 @@ | ||
10 | # $AM_CONFIG_AUX_DIR is prefixed with $(top_srcdir), so it can be used | ||
11 | # in Makefiles. | ||
12 | my $am_config_aux_dir = ''; | ||
13 | +# Directory used at runtime like running test-driver that should not | ||
14 | +# depend on $(top_srcdir) | ||
15 | +my $am_config_rt_aux_dir = ''; | ||
16 | |||
17 | # Directory to search for AC_LIBSOURCE files, as set by AC_CONFIG_LIBOBJ_DIR | ||
18 | # in configure.ac. | ||
19 | @@ -4700,7 +4703,7 @@ | ||
20 | { | ||
21 | require_conf_file ("parallel-tests", FOREIGN, 'test-driver'); | ||
22 | define_variable ("${pfx}LOG_DRIVER", | ||
23 | - "\$(SHELL) $am_config_aux_dir/test-driver", | ||
24 | + "\$(SHELL) $am_config_rt_aux_dir/test-driver", | ||
25 | INTERNAL); | ||
26 | } | ||
27 | my $driver = '$(' . $pfx . 'LOG_DRIVER)'; | ||
28 | @@ -7284,6 +7287,10 @@ | ||
29 | $am_config_aux_dir = | ||
30 | '$(top_srcdir)' . ($config_aux_dir eq '.' ? "" : "/$config_aux_dir"); | ||
31 | $am_config_aux_dir =~ s,/*$,,; | ||
32 | + | ||
33 | + $am_config_rt_aux_dir = | ||
34 | + '$(top_builddir)' . ($config_aux_dir eq '.' ? "" : "/$config_aux_dir"); | ||
35 | + $am_config_rt_aux_dir =~ s,/*$,,; | ||
36 | } | ||