[eclipse-cdt] Patch for https://bugs.eclipse.org/bugs/show_bug.cgi?id=351660

[Jeff Johnston]

commit d5fab764e3d04a537ba70214d54473c19759b2c5
Author: Jeff Johnston <jjohnstn at redhat.com>
Date:   Thu Jul 21 13:47:20 2011 -0400

    Patch for https://bugs.eclipse.org/bugs/show_bug.cgi?id=351660

 eclipse-cdt-autotools-reconfigure.patch |   21 +++++++++++++++++++++
 eclipse-cdt.spec                        |   10 +++++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/eclipse-cdt-autotools-reconfigure.patch b/eclipse-cdt-autotools-reconfigure.patch
new file mode 100644
index 0000000..a421aad
--- /dev/null
+++ b/eclipse-cdt-autotools-reconfigure.patch
@@ -0,0 +1,21 @@
+diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java
+index 2676526..261fef6 100644
+--- a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java
++++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java
+@@ -1251,10 +1251,12 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
+ 			if (!isValidTarget(targetName, makeTargetManager))
+ 				continue;
+ 			try {
+-				IMakeTarget makeTarget = makeTargetManager.findTarget(project, targetName);
+-				if (makeTarget == null)
+-					makeTarget = makeTargetManager.createTarget(
+-						project, targetName, targetBuildID);
++				// Bug #351660 - always create a new MakeTarget because an
++				// existing MakeTarget will cause events to occur on every
++				// modification whereas a new MakeTarget not yet added will
++				// not cause this delay.
++				IMakeTarget makeTarget = makeTargetManager.createTarget(
++								project, targetName, targetBuildID);
+ 				makeTarget.setContainer(project);
+ 				makeTarget.setStopOnError(isStopOnError);
+ 				makeTarget.setRunAllBuilders(false);
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 3edd40c..28bb5ad 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -22,7 +22,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -110,6 +110,10 @@ Patch19: %{name}-autotools-local.patch
 # Adds new public API to org.eclipse.cdt.core.ErrorParserManager.java
 Patch20: %{name}-addProblemMarker.patch
 
+# Fix for Autotools reconfiguring stalling
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=351660
+Patch21: %{name}-autotools-reconfigure.patch
+
 BuildRequires: eclipse-pde >= 1:3.7.0
 BuildRequires: eclipse-rse >= 3.2
 BuildRequires:  java-devel >= 1.4.2
@@ -207,6 +211,7 @@ mkdir autotools
 pushd autotools
 tar -xzf %{SOURCE1}
 %patch19 -p0
+%patch21 -p2
 pushd org.eclipse.linuxtools.cdt.autotools.core
 mkdir macros
 pushd macros
@@ -582,6 +587,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Thu Jul 21 2011 Jeff Johnston <jjohnstn at redhat.com> 1:8.0.0-4
+- Patch for https://bugs.eclipse.org/bugs/show_bug.cgi?id=351660
+
 * Fri Jul 15 2011 Sami Wagiaalla <swagiaal at redhat.com> 1:8.0.0-3
 - Added patch for https://bugs.eclipse.org/bugs/show_bug.cgi?id=352166