git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From 4f576c10613b43cbbfcdf5a451d893faecd6fea9 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 5/6] Set relative to top_builddir path in Makefile to access
   5  test-driver
   6
   7 Signed-off-by: Adrian Calianu <adrian.calianu@enea.com>
   8 Upstream-Status: Inappropriate [specific to oe-core target ptest installation]
   9 Bug-Report: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19042
  10 ---
  11  bin/automake.in | 9 ++++++++-
  12  1 file changed, 8 insertions(+), 1 deletion(-)
  13
  14 diff --git a/bin/automake.in b/bin/automake.in
  15 index 18626de..3aa8706 100644
  16 --- a/bin/automake.in
  17 +++ b/bin/automake.in
  18 @@ -325,6 +325,9 @@ my $config_aux_dir_set_in_configure_ac = 0;
  19  # $AM_CONFIG_AUX_DIR is prefixed with $(top_srcdir), so it can be used
  20  # in Makefiles.
  21  my $am_config_aux_dir = '';
  22 +# Directory used at runtime like running test-driver that should not
  23 +# depend on $(top_srcdir)
  24 +my $am_config_rt_aux_dir = '';
  25
  26  # Directory to search for AC_LIBSOURCE files, as set by AC_CONFIG_LIBOBJ_DIR
  27  # in configure.ac.
  28 @@ -4917,7 +4920,7 @@ sub handle_per_suffix_test
  29      {
  30        require_conf_file ("parallel-tests", FOREIGN, 'test-driver');
  31        define_variable ("${pfx}LOG_DRIVER",
  32 -                       "\$(SHELL) $am_config_aux_dir/test-driver",
  33 +                       "\$(SHELL) $am_config_rt_aux_dir/test-driver",
  34                         INTERNAL);
  35      }
  36    my $driver = '$(' . $pfx . 'LOG_DRIVER)';
  37 @@ -7554,6 +7557,10 @@ sub locate_aux_dir ()
  38    $am_config_aux_dir =
  39      '$(top_srcdir)' . ($config_aux_dir eq '.' ? "" : "/$config_aux_dir");
  40    $am_config_aux_dir =~ s,/*$,,;
  41 +
  42 +  $am_config_rt_aux_dir =
  43 +    '$(top_builddir)' . ($config_aux_dir eq '.' ? "" : "/$config_aux_dir");
  44 +  $am_config_rt_aux_dir =~ s,/*$,,;
  45  }
  46
  47
  48 --
  49 2.39.2
  50