[haiku-commits] haiku: hrev44352 - build/jam
- From: scott mc <scottmc2@xxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 19 Jul 2012 02:02:21 +0200 (CEST)
hrev44352 adds 4 changesets to branch 'master'
old head: 3a5779744ed04ad4dd000e1680e0872b3b99b56e
new head: af2f75a0167a11a9a9fa212a0a4e5d2671cfd8a1
----------------------------------------------------------------------------
1820d4f: Added XZ-Utils as a dependency for LibXML2
95c8d95: Updated build for XZ-Utils
0783fe3: Updated build for LibXML2
af2f75a: Updated cmake to 2.8.5
[ Scott McCreary <scottmc2@xxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 11 insertions(+), 10 deletions(-)
build/jam/OptionalPackageDependencies | 1 +
build/jam/OptionalPackages | 20 ++++++++++----------
############################################################################
Commit: 1820d4fd1591a43c3788064b9c3790d4dafd0577
URL: http://cgit.haiku-os.org/haiku/commit/?id=1820d4f
Author: Scott McCreary <scottmc2@xxxxxxxxx>
Date: Wed Jul 18 23:32:47 2012 UTC
Added XZ-Utils as a dependency for LibXML2
----------------------------------------------------------------------------
diff --git a/build/jam/OptionalPackageDependencies
b/build/jam/OptionalPackageDependencies
index 650783d..aa4a525 100644
--- a/build/jam/OptionalPackageDependencies
+++ b/build/jam/OptionalPackageDependencies
@@ -20,6 +20,7 @@ OptionalPackageDependencies Git : Expat Curl OpenSSL LibIconv
;
OptionalPackageDependencies GitDoc : Man Git ;
OptionalPackageDependencies ICU-devel : DevelopmentBase ;
OptionalPackageDependencies LibLayout : DevelopmentBase ;
+OptionalPackageDependencies LibXML2 : XZ-Utils ;
OptionalPackageDependencies Man : Groff ;
OptionalPackageDependencies Tar : LibIconv ;
OptionalPackageDependencies Python : Bzip ;
############################################################################
Commit: 95c8d9513aa426e3cab2f3ef0d0ab2c9e48c774b
URL: http://cgit.haiku-os.org/haiku/commit/?id=95c8d95
Author: Scott McCreary <scottmc2@xxxxxxxxx>
Date: Wed Jul 18 23:33:36 2012 UTC
Updated build for XZ-Utils
----------------------------------------------------------------------------
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index ad77d54..06c37c2 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -1986,8 +1986,8 @@ if [ IsOptionalHaikuImagePackageAdded XZ-Utils ] {
Echo "No optional package XZ-Utils available for
$(TARGET_ARCH)" ;
} else {
InstallOptionalHaikuImagePackage
- xz-utils-5.0.1-r1a3-x86-gcc4-2011-05-24.zip
- :
$(baseURL)/xz-utils-5.0.1-r1a3-x86-gcc4-2011-05-24.zip ;
+ xz-utils-5.0.1-x86-gcc4-2012-07-18.zip
+ : $(baseURL)/xz-utils-5.0.1-x86-gcc4-2012-07-18.zip ;
AddExpanderRuleToHaikuImage "application/x-xz" : .tar.xz
: "tar -Jtvf \\0045s"
: "tar -Jxvf \\0045s"
############################################################################
Commit: 0783fe388de666cecf6305172550feb3f3dcd8b2
URL: http://cgit.haiku-os.org/haiku/commit/?id=0783fe3
Author: Scott McCreary <scottmc2@xxxxxxxxx>
Date: Wed Jul 18 23:37:00 2012 UTC
Updated build for LibXML2
----------------------------------------------------------------------------
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 06c37c2..6e17c22 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -1206,12 +1206,12 @@ if [ IsOptionalHaikuImagePackageAdded LibXML2 ] {
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- libxml2-2.8.0-x86-gcc4-2012-06-18.zip
- :
$(baseURL)/libxml2-2.8.0-x86-gcc4-2012-06-18.zip ;
+ libxml2-2.8.0-x86-gcc4-2012-07-18.zip
+ :
$(baseURL)/libxml2-2.8.0-x86-gcc4-2012-07-18.zip ;
} else {
InstallOptionalHaikuImagePackage
- libxml2-2.8.0-x86-gcc2-2012-06-21.zip
- :
$(baseURL)/libxml2-2.8.0-x86-gcc2-2012-06-21.zip ;
+ libxml2-2.8.0-x86-gcc2-2012-07-17.zip
+ :
$(baseURL)/libxml2-2.8.0-x86-gcc2-2012-07-17.zip ;
}
}
}
############################################################################
Revision: hrev44352
Commit: af2f75a0167a11a9a9fa212a0a4e5d2671cfd8a1
URL: http://cgit.haiku-os.org/haiku/commit/?id=af2f75a
Author: Scott McCreary <scottmc2@xxxxxxxxx>
Date: Wed Jul 18 23:38:53 2012 UTC
Updated cmake to 2.8.5
----------------------------------------------------------------------------
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 6e17c22..f4b3dd9 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -475,13 +475,13 @@ if [ IsOptionalHaikuImagePackageAdded CMake ] {
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- cmake-2.8.4-r1a3-x86-gcc4-2011-05-23.zip
- :
$(baseURL)/cmake-2.8.4-r1a3-x86-gcc4-2011-05-23.zip
+ cmake-2.8.5-x86-gcc4-2012-07-18.zip
+ : $(baseURL)/cmake-2.8.5-x86-gcc4-2012-07-18.zip
: : true ;
} else {
InstallOptionalHaikuImagePackage
- cmake-2.8.4-r1a3-x86-gcc2-2011-05-19.zip
- :
$(baseURL)/cmake-2.8.4-r1a3-x86-gcc2-2011-05-19.zip
+ cmake-2.8.5-x86-gcc2-2012-07-16.zip
+ : $(baseURL)/cmake-2.8.5-x86-gcc2-2012-07-16.zip
: : true ;
}
}
Other related posts:
- » [haiku-commits] haiku: hrev44352 - build/jam - scott mc
