[haiku-commits] haiku: hrev47871 - build/jam
- From: pulkomandy@xxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 18 Sep 2014 14:57:19 +0200 (CEST)
hrev47871 adds 1 changeset to branch 'master'
old head: fda39620627f5c2fe11a4fa3402077685a511655
new head: 1c3d2f2da4f6e72b58614e1817a5494571acb212
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=1c3d2f2+%5Efda3962
----------------------------------------------------------------------------
1c3d2f2: 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.
[ Adrien Destugues <pulkomandy@xxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev47871
Commit: 1c3d2f2da4f6e72b58614e1817a5494571acb212
URL: http://cgit.haiku-os.org/haiku/commit/?id=1c3d2f2
Author: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date: Thu Sep 18 12:55:55 2014 UTC
----------------------------------------------------------------------------
1 file changed, 7 insertions(+), 1 deletion(-)
build/jam/OptionalPackages | 8 +++++++-
----------------------------------------------------------------------------
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 826341e..0864d69 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 ;
+ ;
}
Other related posts:
- » [haiku-commits] haiku: hrev47871 - build/jam - pulkomandy
