From e49733cf63b60209fe64f31e9c0cecd600267336 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 26 Nov 2009 12:53:30 +0000 Subject: [PATCH] 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 --- build/jam/OptionalPackageDependencies | 1 + build/jam/OptionalPackages | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/build/jam/OptionalPackageDependencies b/build/jam/OptionalPackageDependencies index f91a716f8d..9c7321cc74 100644 --- a/build/jam/OptionalPackageDependencies +++ b/build/jam/OptionalPackageDependencies @@ -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 ; diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 89e4f59904..758b4a22b6 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -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 ;