[haiku-commits] r39249 - haiku/trunk/build/jam
- From: scott mc <scottmc2@xxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 1 Nov 2010 06:49:51 +0100 (CET)
Author: scottmc
Date: 2010-11-01 06:49:49 +0100 (Mon, 01 Nov 2010)
New Revision: 39249
Changeset: http://dev.haiku-os.org/changeset/39249
Modified:
haiku/trunk/build/jam/OptionalLibPackages
haiku/trunk/build/jam/OptionalPackageDependencies
haiku/trunk/build/jam/OptionalPackages
Log:
Added more gcc4 libs, removed duplicate libmng.
Modified: haiku/trunk/build/jam/OptionalLibPackages
===================================================================
--- haiku/trunk/build/jam/OptionalLibPackages 2010-11-01 02:50:10 UTC (rev
39248)
+++ haiku/trunk/build/jam/OptionalLibPackages 2010-11-01 05:49:49 UTC (rev
39249)
@@ -14,12 +14,12 @@
# Available Optional Lib Packages:
# AllegroLibs
+# box2d
# fribidi
# lcms
# libart_lgpl
# libmad
# libmikmod
-# libmng
# libmodplug
# libpaper
# physfs
@@ -60,6 +60,23 @@
}
+# box2d
+if [ IsOptionalHaikuImagePackageAdded box2d ] {
+ if $(TARGET_ARCH) != x86 {
+ Echo "No optional package box2d available for $(TARGET_ARCH)" ;
+ } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
+ InstallOptionalHaikuImagePackage
+ box2d-2.1.2-x86-gcc4-2010-10-30.zip
+ : $(baselibURL)/box2d-2.1.2-x86-gcc4-2010-10-30.zip
+ :
+ : true
+ ;
+ } else {
+ echo "No optional package box2d available for gcc2"
+ }
+}
+
+
# fribidi
if [ IsOptionalHaikuImagePackageAdded fribidi ] {
if $(TARGET_ARCH) != x86 {
@@ -86,6 +103,13 @@
if [ IsOptionalHaikuImagePackageAdded lcms ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package lcms available for $(TARGET_ARCH)" ;
+ } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
+ InstallOptionalHaikuImagePackage
+ lcms-2.0a-x86-gcc4-2010-10-30.zip
+ : $(baselibURL)/lcms-2.0a-x86-gcc4-2010-10-30.zip
+ :
+ : true
+ ;
} else {
InstallOptionalHaikuImagePackage
lcms-2.0a-x86-gcc2-2010-10-29.zip
@@ -101,6 +125,13 @@
if [ IsOptionalHaikuImagePackageAdded libart_lgpl ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package libart_lgpl available for
$(TARGET_ARCH)" ;
+ } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
+ InstallOptionalHaikuImagePackage
+ libart_lgpl-2.3.21-x86-gcc4-2010-10-30.zip
+ :
$(baselibURL)/libart_lgpl-2.3.21-x86-gcc4-2010-10-30.zip
+ :
+ : true
+ ;
} else {
InstallOptionalHaikuImagePackage
libart_lgpl-2.3.21-x86-gcc2-2010-10-29.zip
@@ -116,6 +147,13 @@
if [ IsOptionalHaikuImagePackageAdded libmad ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package libmad available for $(TARGET_ARCH)" ;
+ } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
+ InstallOptionalHaikuImagePackage
+ libmad-0.15.1-x86-gcc4-2010-10-30.zip
+ : $(baselibURL)/libmad-0.15.1-x86-gcc4-2010-10-30.zip
+ :
+ : true
+ ;
} else {
InstallOptionalHaikuImagePackage
libmad-0.15.1-x86-gcc2-2010-10-29.zip
@@ -131,26 +169,17 @@
if [ IsOptionalHaikuImagePackageAdded libmikmod ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package libmikmod available for
$(TARGET_ARCH)" ;
- } else {
+ } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- libmikmod-3.1.11-x86-gcc2-2010-10-29.zip
- : $(baselibURL)/libmikmod-3.1.11-x86-gcc2-2010-10-29.zip
+ libmikmod-3.1.11-x86-gcc4-2010-10-30.zip
+ : $(baselibURL)/libmikmod-3.1.11-x86-gcc4-2010-10-30.zip
:
: true
;
- }
-}
-
-
-# libmng
-# TODO: Libmng exists in OptionalPackages!
-if [ IsOptionalHaikuImagePackageAdded libmng ] {
- if $(TARGET_ARCH) != x86 {
- Echo "No optional package libmng available for $(TARGET_ARCH)" ;
} else {
InstallOptionalHaikuImagePackage
- libmng-1.0.10-x86-gcc2-2010-10-29.zip
- : $(baselibURL)/libmng-1.0.10-x86-gcc2-2010-10-29.zip
+ libmikmod-3.1.11-x86-gcc2-2010-10-29.zip
+ : $(baselibURL)/libmikmod-3.1.11-x86-gcc2-2010-10-29.zip
:
: true
;
@@ -162,6 +191,13 @@
if [ IsOptionalHaikuImagePackageAdded libmodplug ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package libmodplug available for
$(TARGET_ARCH)" ;
+ } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
+ InstallOptionalHaikuImagePackage
+ libmodplug-0.8.7-x86-gcc4-2010-10-30.zip
+ : $(baselibURL)/libmodplug-0.8.7-x86-gcc4-2010-10-30.zip
+ :
+ : true
+ ;
} else {
InstallOptionalHaikuImagePackage
libmodplug-0.8.7-x86-gcc2-2010-10-29.zip
@@ -177,6 +213,13 @@
if [ IsOptionalHaikuImagePackageAdded libpaper ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package libpaper available for
$(TARGET_ARCH)" ;
+ } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
+ InstallOptionalHaikuImagePackage
+ libpaper-1.1.24-x86-gcc4-2010-10-30.zip
+ : $(baselibURL)/libpaper-1.1.24-x86-gcc4-2010-10-30.zip
+ :
+ : true
+ ;
} else {
InstallOptionalHaikuImagePackage
libpaper-1.1.24-x86-gcc2-2010-10-29.zip
Modified: haiku/trunk/build/jam/OptionalPackageDependencies
===================================================================
--- haiku/trunk/build/jam/OptionalPackageDependencies 2010-11-01 02:50:10 UTC
(rev 39248)
+++ haiku/trunk/build/jam/OptionalPackageDependencies 2010-11-01 05:49:49 UTC
(rev 39249)
@@ -5,6 +5,7 @@
# dependencies.
OptionalPackageDependencies APR-util : APR Expat ;
+OptionalPackageDependencies AllegroLibs : XiphLibs ;
OptionalPackageDependencies ArmyKnife : TagLib ;
OptionalPackageDependencies Beam : LibIconv LibLayout OpenSSL PCRE ;
OptionalPackageDependencies BeHappy : BeBook NetSurf ;
@@ -27,7 +28,7 @@
OptionalPackageDependencies OpenSSH : OpenSSL ;
OptionalPackageDependencies Paladin : CCache Fastdep ;
OptionalPackageDependencies Pe : PCRE ;
-OptionalPackageDependencies SDLLibs : XiphLibs libmad libmikmod libmng
libmodplug physfs ;
+OptionalPackageDependencies SDLLibs : XiphLibs libmad libmikmod Libmng
libmodplug physfs ;
OptionalPackageDependencies Subversion : APR-util Neon LibIconv LibXML2
OpenSSL SQLite ;
OptionalPackageDependencies Transmission : LibEvent GetText Curl OpenSSL
LibIconv ;
OptionalPackageDependencies Vim : GetText LibIconv ;
Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages 2010-11-01 02:50:10 UTC (rev
39248)
+++ haiku/trunk/build/jam/OptionalPackages 2010-11-01 05:49:49 UTC (rev
39249)
@@ -988,11 +988,14 @@
if [ IsOptionalHaikuImagePackageAdded Libmng ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package Libmng available for $(TARGET_ARCH)" ;
- } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
- Echo "No optional package Libmng available for gcc4" ;
+ } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
+ InstallOptionalHaikuImagePackage
libmng-1.0.10-x86-gcc4-2010-10-30.zip
+ : $(baseURL)/libmng-1.0.10-x86-gcc4-2010-10-30.zip
+ :
+ ;
} else {
- InstallOptionalHaikuImagePackage
libmng-1.0.10-x86-gcc2-2010-09-26.zip
- : $(baseURL)/libmng-1.0.10-x86-gcc2-2010-09-26.zip
+ InstallOptionalHaikuImagePackage
libmng-1.0.10-x86-gcc2-2010-10-29.zip
+ : $(baseURL)/libmng-1.0.10-x86-gcc2-2010-10-29.zip
:
;
}
Other related posts:
