[haiku-commits] haiku: hrev44522 - build/jam
- From: anevilyak@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 12 Aug 2012 22:02:13 +0200 (CEST)
hrev44522 adds 1 changeset to branch 'master'
old head: 315d8b69d7f899b179bfeb279671ca2b2c18a5c8
new head: ebe79dfe77ac0393c6d222e3a8d3b2d20f601aa3
----------------------------------------------------------------------------
ebe79df: Added GCC4 packages of liblayout, BePDF and Beam.
Provided by Chris Roberts. Thanks!
[ Rene Gollent <anevilyak@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev44522
Commit: ebe79dfe77ac0393c6d222e3a8d3b2d20f601aa3
URL: http://cgit.haiku-os.org/haiku/commit/?id=ebe79df
Author: Rene Gollent <anevilyak@xxxxxxxxx>
Date: Sun Aug 12 20:01:15 2012 UTC
----------------------------------------------------------------------------
1 file changed, 22 insertions(+), 12 deletions(-)
build/jam/OptionalPackages | 34 ++++++++++++++++++++++------------
----------------------------------------------------------------------------
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 6f27127..03eb712 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -209,18 +209,23 @@ if [ IsOptionalHaikuImagePackageAdded BeAE ] {
if [ IsOptionalHaikuImagePackageAdded Beam ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package Beam available for $(TARGET_ARCH)" ;
- } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
- Echo "No optional package Beam available for gcc4" ;
} else {
- InstallOptionalHaikuImagePackage
Beam-1.2alpha-x86-gcc2-2012-06-04.zip
- : $(baseURL)/Beam-1.2alpha-x86-gcc2-2012-06-04.zip ;
+ if $(HAIKU_GCC_VERSION[1]) >= 4 {
+ InstallOptionalHaikuImagePackage
+ beam-1.2alpha-x86-gcc4-2012-08-11.zip
+ :
$(baseURL)/beam-1.2alpha-x86-gcc4-2012-08-11.zip ;
+ } else {
+ InstallOptionalHaikuImagePackage
+ Beam-1.2alpha-x86-gcc2-2012-06-04.zip
+ :
$(baseURL)/Beam-1.2alpha-x86-gcc2-2012-06-04.zip ;
+ }
AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/apps/Beam/Beam ;
}
}
-# BeBook
+# bebook
if [ IsOptionalHaikuImagePackageAdded BeBook ] {
InstallOptionalHaikuImagePackage bebook_20081026.zip
: $(baseURL)/bebook_20081026.zip
@@ -267,12 +272,16 @@ if [ IsOptionalHaikuImagePackageAdded BeOSCompatibility ]
{
if [ IsOptionalHaikuImagePackageAdded BePDF ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package BePDF available for $(TARGET_ARCH)" ;
- } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
- Echo "No optional package BePDF available for gcc4" ;
} else {
- InstallOptionalHaikuImagePackage
- bepdf-1.1.1b4-r1a3-x86-gcc2-2011-05-30.zip
- : $(baseURL)/bepdf-1.1.1b4-r1a3-x86-gcc2-2011-05-30.zip
;
+ if $(HAIKU_GCC_VERSION[1]) >= 4 {
+ InstallOptionalHaikuImagePackage
+ bepdf-1.1.1b4-x86-gcc4-2012-08-11.zip
+ :
$(baseURL)/bepdf-1.1.1b4-x86-gcc4-2012-08-11.zip ;
+ } else {
+ InstallOptionalHaikuImagePackage
+ bepdf-1.1.1b4-r1a3-x86-gcc2-2011-05-30.zip
+ :
$(baseURL)/bepdf-1.1.1b4-r1a3-x86-gcc2-2011-05-30.zip ;
+ }
AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/apps/BePDF/BePDF ;
}
@@ -1200,8 +1209,9 @@ if [ IsOptionalHaikuImagePackageAdded LibIconv ] {
if [ IsOptionalHaikuImagePackageAdded LibLayout ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package LibLayout available for
$(TARGET_ARCH)" ;
- } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
- Echo "No optional package LibLayout available for gcc4" ;
+ } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
+ InstallOptionalHaikuImagePackage
liblayout-1.4.1-gcc4-2012-08-11.zip
+ : $(baseURL)/liblayout-1.4.1-gcc4-2012-08-11.zip ;
} else {
InstallOptionalHaikuImagePackage
liblayout-1.4.0-gcc2-2009-03-08.zip
: $(baseURL)/liblayout-1.4.0-gcc2-2009-03-08.zip ;
Other related posts:
- » [haiku-commits] haiku: hrev44522 - build/jam - anevilyak
