Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated gcc4 OptionalPackages apr, apr-util, beae, burnitnow, ccache and sqlite, for alpha3.

Browse Source 
+alpha3


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41647 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Scott McCreary 2011-05-22 06:11:12 +00:00
parent 2801333400
commit 003ebfa1cc
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
build/jam/OptionalPackages
View File

@ -114,11 +114,13 @@ if [ IsOptionalHaikuImagePackageAdded APR ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) != x86 {
Echo "No optional package APR available for $(TARGET_ARCH)" ; Echo "No optional package APR available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage apr-1.4.2-x86-gcc4-2011-05-05.zip InstallOptionalHaikuImagePackage
: $(baseURL)/apr-1.4.2-x86-gcc4-2011-05-05.zip apr-1.4.2-r1a3-x86-gcc4-2011-05-21.zip
: $(baseURL)/apr-1.4.2-r1a3-x86-gcc4-2011-05-21.zip
: : true ; : : true ;
} else { } else {
InstallOptionalHaikuImagePackage apr-1.4.2-r1a3-x86-gcc2-2011-05-17.zip InstallOptionalHaikuImagePackage
apr-1.4.2-r1a3-x86-gcc2-2011-05-17.zip
: $(baseURL)/apr-1.4.2-r1a3-x86-gcc2-2011-05-17.zip : $(baseURL)/apr-1.4.2-r1a3-x86-gcc2-2011-05-17.zip
: : true ; : : true ;
} }
@ -130,11 +132,13 @@ if [ IsOptionalHaikuImagePackageAdded APR-util ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) != x86 {
Echo "No optional package APR-util available for $(TARGET_ARCH)" ; Echo "No optional package APR-util available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage apr-util-1.3.10-x86-gcc4-2011-05-05.zip InstallOptionalHaikuImagePackage
: $(baseURL)/apr-util-1.3.10-x86-gcc4-2011-05-05.zip apr-util-1.3.10-r1a3-x86-gcc4-2011-05-21.zip
: $(baseURL)/apr-util-1.3.10-r1a3-x86-gcc4-2011-05-21.zip
: : true ; : : true ;
} else { } else {
InstallOptionalHaikuImagePackage apr-util-1.3.10-r1a3-x86-gcc2-2011-05-17.zip InstallOptionalHaikuImagePackage
apr-util-1.3.10-r1a3-x86-gcc2-2011-05-17.zip
: $(baseURL)/apr-util-1.3.10-r1a3-x86-gcc2-2011-05-17.zip : $(baseURL)/apr-util-1.3.10-r1a3-x86-gcc2-2011-05-17.zip
: : true ; : : true ;
} }
@ -148,7 +152,8 @@ if [ IsOptionalHaikuImagePackageAdded ArmyKnife ] {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
Echo "No optional package ArmyKnife for gcc4" ; Echo "No optional package ArmyKnife for gcc4" ;
} else { } else {
InstallOptionalHaikuImagePackage armyknife-61-r1a3-x86-gcc2-2011-05-20.zip InstallOptionalHaikuImagePackage
armyknife-61-r1a3-x86-gcc2-2011-05-20.zip
: $(baseURL)/armyknife-61-r1a3-x86-gcc2-2011-05-20.zip ; : $(baseURL)/armyknife-61-r1a3-x86-gcc2-2011-05-20.zip ;
AddSymlinkToHaikuImage home config be Applications AddSymlinkToHaikuImage home config be Applications
: /boot/apps/ArmyKnife/ArmyKnife ; : /boot/apps/ArmyKnife/ArmyKnife ;
@ -176,10 +181,12 @@ if [ IsOptionalHaikuImagePackageAdded BeAE ] {
Echo "No optional package BeAE available for $(TARGET_ARCH)" ; Echo "No optional package BeAE available for $(TARGET_ARCH)" ;
} else { } else {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage beae-22-x86-gcc4-2010-09-15.zip InstallOptionalHaikuImagePackage
: $(baseURL)/beae-22-x86-gcc4-2010-09-15.zip ; beae-22-r1a3-x86-gcc4-2011-05-21.zip
: $(baseURL)/beae-22-r1a3-x86-gcc4-2011-05-21.zip ;
} else { } else {
InstallOptionalHaikuImagePackage beae-22-r1a3-x86-gcc2-2011-05-18.zip InstallOptionalHaikuImagePackage
beae-22-r1a3-x86-gcc2-2011-05-18.zip
: $(baseURL)/beae-22-r1a3-x86-gcc2-2011-05-18.zip ; : $(baseURL)/beae-22-r1a3-x86-gcc2-2011-05-18.zip ;
} }
AddSymlinkToHaikuImage home config be Applications AddSymlinkToHaikuImage home config be Applications
@ -324,10 +331,12 @@ if [ IsOptionalHaikuImagePackageAdded BurnItNow ] {
Echo "No optional package BurnItNow available for $(TARGET_ARCH)" ; Echo "No optional package BurnItNow available for $(TARGET_ARCH)" ;
} else { } else {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage burnitnow-39-x86-gcc4-2010-09-15.zip InstallOptionalHaikuImagePackage
: $(baseURL)/burnitnow-39-x86-gcc4-2010-09-15.zip ; burnitnow-39-r1a3-x86-gcc4-2011-05-21.zip
: $(baseURL)/burnitnow-39-r1a3-x86-gcc4-2011-05-21.zip ;
} else { } else {
InstallOptionalHaikuImagePackage burnitnow-39-r1a3-x86-gcc2-2011-05-18.zip InstallOptionalHaikuImagePackage
burnitnow-39-r1a3-x86-gcc2-2011-05-18.zip
: $(baseURL)/burnitnow-39-r1a3-x86-gcc2-2011-05-18.zip ; : $(baseURL)/burnitnow-39-r1a3-x86-gcc2-2011-05-18.zip ;
} }
AddSymlinkToHaikuImage home config be Applications AddSymlinkToHaikuImage home config be Applications
@ -360,8 +369,8 @@ if [ IsOptionalHaikuImagePackageAdded CCache ] {
Echo "No optional package CCache available for $(TARGET_ARCH)" ; Echo "No optional package CCache available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
ccache-3.1.4-x86-gcc4-2011-05-12.zip ccache-3.0.1-r1a3-x86-gcc4-2011-05-21.zip
: $(baseURL)/ccache-3.1.4-x86-gcc4-2011-05-12.zip ; : $(baseURL)/ccache-3.0.1-r1a3-x86-gcc4-2011-05-21.zip ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
ccache-3.0.1-r1a3-x86-gcc2-2011-05-17.zip ccache-3.0.1-r1a3-x86-gcc2-2011-05-17.zip
@ -1437,8 +1446,8 @@ if [ IsOptionalHaikuImagePackageAdded SQLite ] {
} else { } else {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
sqlite-3.7.5-x86-gcc4-2011-03-16.zip sqlite-3.7.5-r1a3-x86-gcc4-2011-05-21.zip
: $(baseURL)/sqlite-3.7.5-x86-gcc4-2011-03-16.zip ; : $(baseURL)/sqlite-3.7.5-r1a3-x86-gcc4-2011-05-21.zip ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
sqlite-3.7.5-r1a3-x86-gcc2-2011-05-17.zip sqlite-3.7.5-r1a3-x86-gcc2-2011-05-17.zip