Updated python build to use newer patch which was updated by Chris Roberts. Added Bzip2 and made it a dependency for python. This now allows python to extraxt .bz2 files.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34277 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Scott McCreary
2009-11-26 12:53:30 +00:00
parent 432bb91f34
commit e49733cf63
2 changed files with 17 additions and 2 deletions
+1
View File
@@ -12,5 +12,6 @@ OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ;
OptionalPackageDependencies LibLayout : DevelopmentBase ;
OptionalPackageDependencies NetSurf : OpenSSL ;
OptionalPackageDependencies OpenSSH : OpenSSL ;
OptionalPackageDependencies Python : Bzip ;
OptionalPackageDependencies Mercurial : Python ;
OptionalPackageDependencies Git : Expat Curl OpenSSL ;
+16 -2
View File
@@ -195,6 +195,20 @@ if [ IsOptionalHaikuImagePackageAdded Bluetooth ] {
}
# Bzip
if [ IsOptionalHaikuImagePackageAdded Bzip ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package Bzip available for $(TARGET_ARCH)" ;
} else {
InstallOptionalHaikuImagePackage bzip2-1.0.5-x86-gcc2-2009-10-22
: $(baseURL)/bzip2-1.0.5-x86-gcc2-2009-10-22.zip
:
: true
;
}
}
# CDRecord
if [ IsOptionalHaikuImagePackageAdded CDRecord ] {
if $(TARGET_ARCH) != x86 {
@@ -794,8 +808,8 @@ if [ IsOptionalHaikuImagePackageAdded Python ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package Python available for $(TARGET_ARCH)" ;
} else {
InstallOptionalHaikuImagePackage python-2.6.4-x86-gcc2-2009-10-28
: $(baseURL)/python-2.6.4-x86-gcc2-2009-10-28.zip
InstallOptionalHaikuImagePackage python-2.6.4-x86-gcc2-2009-11-26
: $(baseURL)/python-2.6.4-x86-gcc2-2009-11-26.zip
:
: true
;