From 95e05f485d8a44f14864ba7492f9dfa2a6494b4f Mon Sep 17 00:00:00 2001
From: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Date: Sun, 5 Feb 2017 00:40:01 -0500
Subject: [PATCH] Remove profiles that helped skip ppc64le

Those profiles were useful when keeping compatibility with Eclipse 4.5
but this is not required anymore.

Change-Id: Ic9ef7beecee1b5bd072ec192048ab409b19844c9
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
---
 core/org.eclipse.cdt.core.linux/pom.xml | 48 ++---------------
 pom.xml                                 | 69 +++----------------------
 2 files changed, 11 insertions(+), 106 deletions(-)

diff --git a/core/org.eclipse.cdt.core.linux/pom.xml b/core/org.eclipse.cdt.core.linux/pom.xml
index b1c43f7e50a..a0559780e89 100644
--- a/core/org.eclipse.cdt.core.linux/pom.xml
+++ b/core/org.eclipse.cdt.core.linux/pom.xml
@@ -16,49 +16,6 @@
   <packaging>eclipse-plugin</packaging>
 
 	<profiles>
-		<profile>
-			<id>ppc64le</id>
-				<build>				
-					<plugins>
-						<plugin>
-							<groupId>org.eclipse.tycho</groupId>
-							<artifactId>target-platform-configuration</artifactId>
-							<version>${tycho-version}</version>
-							<configuration>
-								<resolver>p2</resolver>
-								<pomDependencies>consider</pomDependencies>
-								<environments>
-								   <environment>
-								     <os>linux</os>
-								     <ws>gtk</ws>
-								     <arch>ppc64le</arch>
-                        					   </environment>
-								   <environment>
-								      <os>linux</os>
-								      <ws>gtk</ws>
-								      <arch>x86</arch>
-								    </environment>
-								    <environment>
-								      <os>linux</os>
-								      <ws>gtk</ws>
-								      <arch>x86_64</arch>
-								    </environment>
-								    <environment>
-								      <os>linux</os>
-								      <ws>gtk</ws>
-								      <arch>ppc</arch>
-								    </environment>
-								    <environment>
-								      <os>linux</os>
-								      <ws>gtk</ws>
-								      <arch>ppc64</arch>
-								    </environment>
-								</environments>
-							</configuration>
-						</plugin>
-					</plugins>
-				</build>	
-		</profile>
 		<profile>
 			<id>build-native.linux.x86</id>
 			<activation>
@@ -251,6 +208,11 @@
 	      <ws>gtk</ws>
 	      <arch>ppc64</arch>
 	    </environment>
+	    <environment>
+	      <os>linux</os>
+	      <ws>gtk</ws>
+	      <arch>ppc64le</arch>
+	    </environment>
 	  </environments>
 	</configuration>
       </plugin>
diff --git a/pom.xml b/pom.xml
index 664ed687b96..e14ff386271 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,6 +50,7 @@
 		<module>core/org.eclipse.cdt.core.linux.x86</module>
 		<module>core/org.eclipse.cdt.core.linux.x86_64</module>
 		<module>core/org.eclipse.cdt.core.linux.ppc64</module>
+		<module>core/org.eclipse.cdt.core.linux.ppc64le</module>
 		<module>core/org.eclipse.cdt.core.win32</module>
 		<module>core/org.eclipse.cdt.core.win32.x86</module>
 		<module>core/org.eclipse.cdt.core.win32.x86_64</module>
@@ -348,69 +349,6 @@
 				</plugins>
 			</build>
 		</profile>
-		<profile>
-			<id>ppc64le</id>
-			    <activation>
-        			<property>
-          				<name>!skip-ppc64le</name>
-        			</property>
-      			</activation>
-      			<modules>
-					<module>core/org.eclipse.cdt.core.linux.ppc64le</module>
-				</modules>
-				<build>				
-					<plugins>
-						<plugin>
-							<groupId>org.eclipse.tycho</groupId>
-							<artifactId>target-platform-configuration</artifactId>
-							<version>${tycho-version}</version>
-							<configuration>
-							  <resolver>p2</resolver>
-							  <pomDependencies>consider</pomDependencies>
-							<!-- We need to add all supported environments here as tycho does not currently -->
-							<!-- append the environments but replaces them with this definition -->
-							  <environments>
-								<environment>
-									<os>linux</os>
-									<ws>gtk</ws>
-									<arch>x86</arch>
-								</environment>
-								<environment>
-									<os>linux</os>
-									<ws>gtk</ws>
-									<arch>x86_64</arch>
-								</environment>
-								<environment>
-									<os>linux</os>
-									<ws>gtk</ws>
-									<arch>ppc64</arch>
-								</environment>
-								<environment>
-									<os>win32</os>
-									<ws>win32</ws>
-									<arch>x86</arch>
-								</environment>
-								<environment>
-									<os>win32</os>
-									<ws>win32</ws>
-									<arch>x86_64</arch>
-								</environment>
-								<environment>
-									<os>macosx</os>
-									<ws>cocoa</ws>
-									<arch>x86_64</arch>
-								</environment>
-								<environment>
-									<os>linux</os>
-									<ws>gtk</ws>
-									<arch>ppc64le</arch>
-								</environment>
-							  </environments>
-							</configuration>
-						</plugin>
-					</plugins>
-				</build>	
-		</profile>
 	</profiles>
 	<build>
 		<plugins>
@@ -443,6 +381,11 @@
 							<ws>gtk</ws>
 							<arch>ppc64</arch>
 						</environment>
+						<environment>
+							<os>linux</os>
+							<ws>gtk</ws>
+							<arch>ppc64le</arch>
+						</environment>
 						<environment>
 							<os>win32</os>
 							<ws>win32</ws>