Added GCC4 packages of liblayout, BePDF and Beam.

Provided by Chris Roberts. Thanks!
This commit is contained in:
Rene Gollent
2012-08-12 16:01:50 -04:00
parent 315d8b69d7
commit ebe79dfe77
+22 -12
View File
@@ -209,18 +209,23 @@ if [ IsOptionalHaikuImagePackageAdded BeAE ] {
if [ IsOptionalHaikuImagePackageAdded Beam ] { if [ IsOptionalHaikuImagePackageAdded Beam ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) != x86 {
Echo "No optional package Beam available for $(TARGET_ARCH)" ; 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 { } else {
InstallOptionalHaikuImagePackage Beam-1.2alpha-x86-gcc2-2012-06-04.zip if $(HAIKU_GCC_VERSION[1]) >= 4 {
: $(baseURL)/Beam-1.2alpha-x86-gcc2-2012-06-04.zip ; 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 AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/apps/Beam/Beam ; : /boot/apps/Beam/Beam ;
} }
} }
# BeBook # bebook
if [ IsOptionalHaikuImagePackageAdded BeBook ] { if [ IsOptionalHaikuImagePackageAdded BeBook ] {
InstallOptionalHaikuImagePackage bebook_20081026.zip InstallOptionalHaikuImagePackage bebook_20081026.zip
: $(baseURL)/bebook_20081026.zip : $(baseURL)/bebook_20081026.zip
@@ -267,12 +272,16 @@ if [ IsOptionalHaikuImagePackageAdded BeOSCompatibility ] {
if [ IsOptionalHaikuImagePackageAdded BePDF ] { if [ IsOptionalHaikuImagePackageAdded BePDF ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) != x86 {
Echo "No optional package BePDF available for $(TARGET_ARCH)" ; 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 { } else {
InstallOptionalHaikuImagePackage if $(HAIKU_GCC_VERSION[1]) >= 4 {
bepdf-1.1.1b4-r1a3-x86-gcc2-2011-05-30.zip InstallOptionalHaikuImagePackage
: $(baseURL)/bepdf-1.1.1b4-r1a3-x86-gcc2-2011-05-30.zip ; 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 AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/apps/BePDF/BePDF ; : /boot/apps/BePDF/BePDF ;
} }
@@ -1200,8 +1209,9 @@ if [ IsOptionalHaikuImagePackageAdded LibIconv ] {
if [ IsOptionalHaikuImagePackageAdded LibLayout ] { if [ IsOptionalHaikuImagePackageAdded LibLayout ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) != x86 {
Echo "No optional package LibLayout available for $(TARGET_ARCH)" ; Echo "No optional package LibLayout available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
Echo "No optional package LibLayout available for gcc4" ; InstallOptionalHaikuImagePackage liblayout-1.4.1-gcc4-2012-08-11.zip
: $(baseURL)/liblayout-1.4.1-gcc4-2012-08-11.zip ;
} else { } else {
InstallOptionalHaikuImagePackage liblayout-1.4.0-gcc2-2009-03-08.zip InstallOptionalHaikuImagePackage liblayout-1.4.0-gcc2-2009-03-08.zip
: $(baseURL)/liblayout-1.4.0-gcc2-2009-03-08.zip ; : $(baseURL)/liblayout-1.4.0-gcc2-2009-03-08.zip ;