[haiku-commits] Re: haiku: hrev44921 - build/jam
- From: scottmc <scottmc2@xxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 28 Nov 2012 16:11:10 -0800
Nice work.
On Wed, Nov 28, 2012 at 1:32 PM, <alex@xxxxxxxxxxxxxxxx> wrote:
> hrev44921 adds 1 changeset to branch 'master'
> old head: 9def48ad2e7ef77665a09724536d4f456405b64c
> new head: 133a094f800056ab5f6c4ec44cf8a8a20c38a701
> overview:
> http://cgit.haiku-os.org/haiku/log/?qt=range&q=133a094+%5E9def48a
>
>
> ----------------------------------------------------------------------------
>
> 133a094: Added Python optional package for x86_64.
>
> [ Alex Smith <alex@xxxxxxxxxxxxxxxx>
> ]
>
>
> ----------------------------------------------------------------------------
>
> Revision: hrev44921
> Commit: 133a094f800056ab5f6c4ec44cf8a8a20c38a701
> URL: http://cgit.haiku-os.org/haiku/commit/?id=133a094
> Author: Alex Smith <alex@xxxxxxxxxxxxxxxx>
> Date: Wed Nov 28 21:32:32 2012 UTC
>
>
> ----------------------------------------------------------------------------
>
> 1 file changed, 8 insertions(+), 3 deletions(-)
> build/jam/OptionalPackages | 11 ++++++++---
>
>
> ----------------------------------------------------------------------------
>
> diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
> index b4574e4..c48b94b 100644
> --- a/build/jam/OptionalPackages
> +++ b/build/jam/OptionalPackages
> @@ -1749,9 +1749,7 @@ if [ IsOptionalHaikuImagePackageAdded Puri ] {
>
> # Python
> if [ IsOptionalHaikuImagePackageAdded Python ] {
> - if $(TARGET_ARCH) != x86 {
> - Echo "No optional package Python available for
> $(TARGET_ARCH)" ;
> - } else {
> + if $(TARGET_ARCH) = x86 {
> if $(HAIKU_GCC_VERSION[1]) >= 4 {
> InstallOptionalHaikuImagePackage
> python-2.6.8-r1a4-x86-gcc4-2012-09-03.zip
> @@ -1763,6 +1761,13 @@ if [ IsOptionalHaikuImagePackageAdded Python ] {
> :
> $(baseURL)/python-2.6.8-r1a4-x86-gcc2-2012-08-30.zip
> : : true ;
> }
> + } else if $(TARGET_ARCH) = x86_64 {
> + InstallOptionalHaikuImagePackage
> + python-2.6.8-x86_64-2012-11-28.zip
> + : $(baseURL)/python-2.6.8-x86_64-2012-11-28.zip
> + : : true ;
> + } else {
> + Echo "No optional package Python available for
> $(TARGET_ARCH)" ;
> }
> }
>
>
>
>
Other related posts:
