From 779c492f7b69ce0a2bc739e5f8f47de0262bf559 Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Tue, 29 Mar 2016 21:56:16 +0200 Subject: automake: remove patch integrated in poky Signed-off-by: Tudor Florea Signed-off-by: Martin Borg --- .../automake/new_rt_path_for_test-driver.patch | 35 ---------------------- recipes-devtools/automake/automake_1.14.1.bbappend | 5 ---- 2 files changed, 40 deletions(-) delete mode 100644 recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch delete mode 100644 recipes-devtools/automake/automake_1.14.1.bbappend (limited to 'recipes-devtools') diff --git a/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch b/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch deleted file mode 100644 index fae10b3..0000000 --- a/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch +++ /dev/null @@ -1,35 +0,0 @@ -Set relative to top_builddir path in Makefile to access test-driver - -Signed-off-by: Adrian Calianu -Upstream-Status: Pending - ---- a/bin/automake.in -+++ b/bin/automake.in -@@ -272,6 +272,9 @@ - # $AM_CONFIG_AUX_DIR is prefixed with $(top_srcdir), so it can be used - # in Makefiles. - my $am_config_aux_dir = ''; -+# Directory used at runtime like running test-driver that should not -+# depend on $(top_srcdir) -+my $am_config_rt_aux_dir = ''; - - # Directory to search for AC_LIBSOURCE files, as set by AC_CONFIG_LIBOBJ_DIR - # in configure.ac. -@@ -4700,7 +4703,7 @@ - { - require_conf_file ("parallel-tests", FOREIGN, 'test-driver'); - define_variable ("${pfx}LOG_DRIVER", -- "\$(SHELL) $am_config_aux_dir/test-driver", -+ "\$(SHELL) $am_config_rt_aux_dir/test-driver", - INTERNAL); - } - my $driver = '$(' . $pfx . 'LOG_DRIVER)'; -@@ -7284,6 +7287,10 @@ - $am_config_aux_dir = - '$(top_srcdir)' . ($config_aux_dir eq '.' ? "" : "/$config_aux_dir"); - $am_config_aux_dir =~ s,/*$,,; -+ -+ $am_config_rt_aux_dir = -+ '$(top_builddir)' . ($config_aux_dir eq '.' ? "" : "/$config_aux_dir"); -+ $am_config_rt_aux_dir =~ s,/*$,,; - } diff --git a/recipes-devtools/automake/automake_1.14.1.bbappend b/recipes-devtools/automake/automake_1.14.1.bbappend deleted file mode 100644 index c3f22b8..0000000 --- a/recipes-devtools/automake/automake_1.14.1.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += " \ - file://new_rt_path_for_test-driver.patch \ - " -- cgit v1.2.3-54-g00ecf