diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2018-07-03 12:11:53 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-05 00:22:08 +0100 |
commit | 4604255985ebdc03d159bea66ecb527b993a585e (patch) | |
tree | 58fcbf01049532f8597b61a647902a5caf7eeaf1 /meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch | |
parent | bf760b5d9d00bfa7d3d98b5aedac478707c7315d (diff) | |
download | poky-4604255985ebdc03d159bea66ecb527b993a585e.tar.gz |
automake: 1.15.1 -> 1.16.1
* Refreshed the following patches:
- 0001-automake-Add-default-libtool_tag-to-cppasm.patch
- automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch
- buildtest.patch
- new_rt_path_for_test-driver.patch
- performance.patch
- python-libdir.patch
(From OE-Core rev: f63a493298de7d0cac36a65dafba5dae06c06a05)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 | 22 |
1 files changed, 17 insertions, 5 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 index 2c6594f523..1f71722334 100644 --- 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 | |||
@@ -1,22 +1,32 @@ | |||
1 | Set relative to top_builddir path in Makefile to access test-driver | 1 | From f78dfa39139d528c94d72f27994f337f2fd3b6bd Mon Sep 17 00:00:00 2001 |
2 | From: Adrian Calianu <adrian.calianu@enea.com> | ||
3 | Date: Thu, 25 Feb 2016 16:08:04 +0100 | ||
4 | Subject: [PATCH] Set relative to top_builddir path in Makefile to access | ||
5 | test-driver | ||
2 | 6 | ||
3 | Signed-off-by: Adrian Calianu <adrian.calianu@enea.com> | 7 | Signed-off-by: Adrian Calianu <adrian.calianu@enea.com> |
4 | Upstream-Status: Pending | 8 | Upstream-Status: Pending |
5 | Bug-Report: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19042 | 9 | Bug-Report: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19042 |
6 | 10 | ||
11 | --- | ||
12 | bin/automake.in | 9 ++++++++- | ||
13 | 1 file changed, 8 insertions(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/bin/automake.in b/bin/automake.in | ||
16 | index a52a489..8377d20 100644 | ||
7 | --- a/bin/automake.in | 17 | --- a/bin/automake.in |
8 | +++ b/bin/automake.in | 18 | +++ b/bin/automake.in |
9 | @@ -272,6 +272,9 @@ | 19 | @@ -324,6 +324,9 @@ my $config_aux_dir_set_in_configure_ac = 0; |
10 | # $AM_CONFIG_AUX_DIR is prefixed with $(top_srcdir), so it can be used | 20 | # $AM_CONFIG_AUX_DIR is prefixed with $(top_srcdir), so it can be used |
11 | # in Makefiles. | 21 | # in Makefiles. |
12 | my $am_config_aux_dir = ''; | 22 | my $am_config_aux_dir = ''; |
13 | +# Directory used at runtime like running test-driver that should not | 23 | +# Directory used at runtime like running test-driver that should not |
14 | +# depend on $(top_srcdir) | 24 | +# depend on $(top_srcdir) |
15 | +my $am_config_rt_aux_dir = ''; | 25 | +my $am_config_rt_aux_dir = ''; |
16 | 26 | ||
17 | # Directory to search for AC_LIBSOURCE files, as set by AC_CONFIG_LIBOBJ_DIR | 27 | # Directory to search for AC_LIBSOURCE files, as set by AC_CONFIG_LIBOBJ_DIR |
18 | # in configure.ac. | 28 | # in configure.ac. |
19 | @@ -4700,7 +4703,7 @@ | 29 | @@ -4854,7 +4857,7 @@ sub handle_per_suffix_test |
20 | { | 30 | { |
21 | require_conf_file ("parallel-tests", FOREIGN, 'test-driver'); | 31 | require_conf_file ("parallel-tests", FOREIGN, 'test-driver'); |
22 | define_variable ("${pfx}LOG_DRIVER", | 32 | define_variable ("${pfx}LOG_DRIVER", |
@@ -25,7 +35,7 @@ Bug-Report: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19042 | |||
25 | INTERNAL); | 35 | INTERNAL); |
26 | } | 36 | } |
27 | my $driver = '$(' . $pfx . 'LOG_DRIVER)'; | 37 | my $driver = '$(' . $pfx . 'LOG_DRIVER)'; |
28 | @@ -7284,6 +7287,10 @@ | 38 | @@ -7440,6 +7443,10 @@ sub locate_aux_dir () |
29 | $am_config_aux_dir = | 39 | $am_config_aux_dir = |
30 | '$(top_srcdir)' . ($config_aux_dir eq '.' ? "" : "/$config_aux_dir"); | 40 | '$(top_srcdir)' . ($config_aux_dir eq '.' ? "" : "/$config_aux_dir"); |
31 | $am_config_aux_dir =~ s,/*$,,; | 41 | $am_config_aux_dir =~ s,/*$,,; |
@@ -34,3 +44,5 @@ Bug-Report: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19042 | |||
34 | + '$(top_builddir)' . ($config_aux_dir eq '.' ? "" : "/$config_aux_dir"); | 44 | + '$(top_builddir)' . ($config_aux_dir eq '.' ? "" : "/$config_aux_dir"); |
35 | + $am_config_rt_aux_dir =~ s,/*$,,; | 45 | + $am_config_rt_aux_dir =~ s,/*$,,; |
36 | } | 46 | } |
47 | |||
48 | |||