From 1c3d2f2da4f6e72b58614e1817a5494571acb212 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Thu, 18 Sep 2014 14:55:55 +0200
Subject: [PATCH] Remove git_cvs from the non-hybrid gcc2 image.

It depends on gcc4-only package cvsps. Thanks to Ingo for suggestion on
how to do this.
---
 build/jam/OptionalPackages | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 826341e38d..0864d69609 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -178,7 +178,13 @@ if [ IsOptionalHaikuImagePackageAdded FFMpeg-devel ] {
 
 # Git
 if [ IsOptionalHaikuImagePackageAdded Git ] {
-	AddHaikuImagePackages git git_arch git_cvs git_daemon git_email git_svn ;
+	AddHaikuImagePackages git git_arch git_daemon git_email git_svn ;
+
+	# git_cvs depends on cvsps, which does not build with gcc2. So it is not
+	# available on gcc2-only builds.
+	if $(TARGET_PACKAGING_ARCHS) != x86_gcc2 {
+		AddHaikuImagePackages git_cvs ;
+	;
 }