[haiku-commits] haiku: hrev44629 - build/jam

  • From: scott mc <scottmc2@xxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Wed, 12 Sep 2012 09:02:29 +0200 (CEST)

hrev44629 adds 2 changesets to branch 'master'
old head: 1bd07482531e9fae514212e729ce94eb7b534f42
new head: 30aeebc7164b9db52cca6bed650c23331f5f45c0

----------------------------------------------------------------------------

554fe14: Updated several more OptionalPackages

30aeebc: Rebuilf beam and transmission gcc4 packages

                                     [ Scott McCreary <scottmc2@xxxxxxxxx> ]

----------------------------------------------------------------------------

2 files changed, 32 insertions(+), 28 deletions(-)
build/jam/OptionalLibPackages |   20 +++++++++----------
build/jam/OptionalPackages    |   40 ++++++++++++++++++++-----------------

############################################################################

Commit:      554fe146cb72b440f13241f798d7de80e986f5ab
URL:         http://cgit.haiku-os.org/haiku/commit/?id=554fe14
Author:      Scott McCreary <scottmc2@xxxxxxxxx>
Date:        Tue Sep 11 07:09:53 2012 UTC

Updated several more OptionalPackages

----------------------------------------------------------------------------

diff --git a/build/jam/OptionalLibPackages b/build/jam/OptionalLibPackages
index b02eada..0b32992 100644
--- a/build/jam/OptionalLibPackages
+++ b/build/jam/OptionalLibPackages
@@ -38,14 +38,14 @@ if [ IsOptionalHaikuImagePackageAdded AllegroLibs ] {
                Echo "No optional package AllegroLibs available for 
$(TARGET_ARCH)" ;
        } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
                InstallOptionalHaikuImagePackage
-                       allegro-4.4.1.1-r1a3-x86-gcc4-2011-05-26.zip
-                       : 
$(baseURL)/lib/allegro-4.4.1.1-r1a3-x86-gcc4-2011-05-26.zip ;
+                       allegro-4.4.1.1-r1a4-x86-gcc4-2012-09-09.zip
+                       : 
$(baseURL)/lib/allegro-4.4.1.1-r1a4-x86-gcc4-2012-09-09.zip ;
                InstallOptionalHaikuImagePackage
-                       dumb-0.9.3-r1a3-x86-gcc4-2011-05-26.zip
-                       : 
$(baseURL)/lib/dumb-0.9.3-r1a3-x86-gcc4-2011-05-26.zip ;
+                       dumb-0.9.3-r1a4-x86-gcc4-2012-09-09.zip
+                       : 
$(baseURL)/lib/dumb-0.9.3-r1a4-x86-gcc4-2012-09-09.zip ;
                InstallOptionalHaikuImagePackage
-                       jgmod-0.99-r1a3-x86-gcc4-2011-05-26.zip
-                       : 
$(baseURL)/lib/jgmod-0.99-r1a3-x86-gcc4-2011-05-26.zip ;
+                       jgmod-0.99-r1a4-x86-gcc4-2012-09-09.zip
+                       : 
$(baseURL)/lib/jgmod-0.99-r1a4-x86-gcc4-2012-09-09.zip ;
        } else {
                InstallOptionalHaikuImagePackage
                        allegro-4.4.1.1-r1a3-x86-gcc2-2011-05-19.zip
@@ -67,8 +67,8 @@ if [ IsOptionalHaikuImagePackageAdded box2d ] {
        } else {
                if $(HAIKU_GCC_VERSION[1]) >= 4 || $(isHybridBuild) {
                        InstallOptionalHaikuImagePackage
-                               box2d-2.1.2-r1a3-r1a3-x86-gcc4-2011-05-26.zip
-                               : 
$(baseURL)/lib/box2d-2.1.2-r1a3-x86-gcc4-2011-05-26.zip
+                               box2d-2.1.2-r1a4-x86-gcc4-2012-09-09.zip
+                               : 
$(baseURL)/lib/box2d-2.1.2-r1a4-x86-gcc4-2012-09-09.zip
                                : : true ;
                } else {
                        Echo "No optional package box2d available for 
$(TARGET_ARCH)-gcc2" ;
@@ -209,8 +209,8 @@ if [ IsOptionalHaikuImagePackageAdded physfs ] {
                Echo "No optional package physfs available for $(TARGET_ARCH)" ;
        } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
                InstallOptionalHaikuImagePackage
-                       physfs-2.0.1-r1a3-x86-gcc4-2011-05-26.zip
-                       : 
$(baseURL)/lib/physfs-2.0.1-r1a3-x86-gcc4-2011-05-26.zip
+                       physfs-2.0.1-r1a4-x86-gcc4-2012-09-09.zip
+                       : 
$(baseURL)/lib/physfs-2.0.1-r1a4-x86-gcc4-2012-09-09.zip
                        : : true ;
        } else {
                InstallOptionalHaikuImagePackage
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 5af5efa..f8b3bb8 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -715,8 +715,8 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ]
                        m4-1.4.16-r1a4-x86-gcc2-2012-08-26.zip
                        : $(baseURL)/m4-1.4.16-r1a4-x86-gcc2-2012-08-26.zip ;
                InstallOptionalHaikuImagePackage
-                       flex-2.5.35-r1a4-x86-gcc2-2012-08-26.zip
-                       : $(baseURL)/flex-2.5.35-r1a4-x86-gcc2-2012-08-26.zip ;
+                       flex-2.5.35-r1a4-x86-gcc2-2012-09-10.zip
+                       : $(baseURL)/flex-2.5.35-r1a4-x86-gcc2-2012-09-10.zip ;
                InstallOptionalHaikuImagePackage
                        jam-2.5-r1a4-x86-gcc2-2012-08-27.zip
                        : $(baseURL)/jam-2.5-r1a4-x86-gcc2-2012-08-27.zip ;
@@ -1141,12 +1141,12 @@ if [ IsOptionalHaikuImagePackageAdded KeymapSwitcher ] {
        } else {
                if $(HAIKU_GCC_VERSION[1]) >= 4 {
                        InstallOptionalHaikuImagePackage
-                               KeymapSwitcher-1.2.7-x86-gcc4-2012-05-19.zip
-                               : 
$(baseURL)/KeymapSwitcher-1.2.7-x86-gcc4-2012-05-19.zip ;
+                               
KeymapSwitcher-1.2.7-r1a4-x86-gcc4-2012-09-09.zip
+                               : 
$(baseURL)/KeymapSwitcher-1.2.7-r1a4-x86-gcc4-2012-09-09.zip ;
                } else {
                        InstallOptionalHaikuImagePackage
-                               KeymapSwitcher-1.2.7-x86-gcc2-2012-05-19.zip
-                               : 
$(baseURL)/KeymapSwitcher-1.2.7-x86-gcc2-2012-05-19.zip ;
+                               
KeymapSwitcher-1.2.7-r1a4-x86-gcc2-2012-08-31.zip
+                               : 
$(baseURL)/KeymapSwitcher-1.2.7-r1a4-x86-gcc2-2012-08-31.zip ;
                }
                AddSymlinkToHaikuImage home config settings deskbar Preferences
                        : /boot/common/bin/KeymapSwitcher ;
@@ -1273,8 +1273,12 @@ if [ IsOptionalHaikuImagePackageAdded LibXSLT ] {
 if [ IsOptionalHaikuImagePackageAdded Links ] {
        if $(TARGET_ARCH) != x86 {
                Echo "No optional package Links available for $(TARGET_ARCH)" ;
-       } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
-               Echo "No optional package Links available for gcc4" ;
+       } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
+               InstallOptionalHaikuImagePackage
+                       links-2.3pre2-r1a4-x86-gcc4-2012-09-09.zip
+                       : $(baseURL)/links-2.3pre2-r1a4-x86-gcc4-2012-09-09.zip 
;
+               AddSymlinkToHaikuImage home config settings deskbar Applications
+                       : /boot/home/config/bin/links ;
        } else {
                InstallOptionalHaikuImagePackage
                        links-2.3pre2-r1a4-x86-gcc2-2012-08-30.zip
@@ -1648,8 +1652,8 @@ if [ IsOptionalHaikuImagePackageAdded Rsync ] {
        } else {
                if $(HAIKU_GCC_VERSION[1]) >= 4 {
                        InstallOptionalHaikuImagePackage
-                               rsync-3.0.7-r1a4-x86-gcc4-2012-08-31.zip
-                               : 
$(baseURL)/rsync-3.0.7-r1a4-x86-gcc4-2012-08-31.zip
+                               rsync-3.0.7-r1a4-x86-gcc4-2012-09-09.zip
+                               : 
$(baseURL)/rsync-3.0.7-r1a4-x86-gcc4-2012-09-09.zip
                                : : true ;
                } else {
                        InstallOptionalHaikuImagePackage
@@ -1667,12 +1671,12 @@ if [ IsOptionalHaikuImagePackageAdded Ruby ] {
                Echo "No optional package Ruby available for $(TARGET_ARCH)" ;
        } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
                InstallOptionalHaikuImagePackage
-                       ruby-1.9.1-r1a4-x86-gcc4-2012-08-31.zip
-                       : $(baseURL)/ruby-1.9.1-r1a4-x86-gcc4-2012-08-31.zip ;
+                       ruby-1.9.1-r1a4-x86-gcc4-2012-09-10.zip
+                       : $(baseURL)/ruby-1.9.1-r1a4-x86-gcc4-2012-09-10.zip ;
        } else {
                InstallOptionalHaikuImagePackage
-                       ruby-1.9.1-r1a4-x86-gcc2-2012-08-29.zip
-                       : $(baseURL)/ruby-1.9.1-r1a4-x86-gcc2-2012-08-29.zip ;
+                       ruby-1.9.1-r1a4-x86-gcc2-2012-09-10.zip
+                       : $(baseURL)/ruby-1.9.1-r1a4-x86-gcc2-2012-09-10.zip ;
        }
 }
 

############################################################################

Revision:    hrev44629
Commit:      30aeebc7164b9db52cca6bed650c23331f5f45c0
URL:         http://cgit.haiku-os.org/haiku/commit/?id=30aeebc
Author:      Scott McCreary <scottmc2@xxxxxxxxx>
Date:        Wed Sep 12 06:37:24 2012 UTC

Rebuilf beam and transmission gcc4 packages

----------------------------------------------------------------------------

diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index f8b3bb8..9126624 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -213,8 +213,8 @@ if [ IsOptionalHaikuImagePackageAdded Beam ] {
        } else {
                if $(HAIKU_GCC_VERSION[1]) >= 4 {
                        InstallOptionalHaikuImagePackage
-                               beam-1.2alpha-x86-gcc4-2012-08-11.zip
-                               : 
$(baseURL)/beam-1.2alpha-x86-gcc4-2012-08-11.zip ;
+                               beam-1.2alpha-r1a4-x86-gcc4-2012-09-12.zip
+                               : 
$(baseURL)/beam-1.2alpha-r1a4-x86-gcc4-2012-09-12.zip ;
                } else {
                        InstallOptionalHaikuImagePackage
                                beam-1.2alpha-r1a4-x86-gcc2-2012-08-29.zip
@@ -1792,8 +1792,8 @@ if [ IsOptionalHaikuImagePackageAdded Transmission ] {
        } else {
                if $(HAIKU_GCC_VERSION[1]) >= 4 {
                        InstallOptionalHaikuImagePackage
-                               transmission-2.21-r1a4-x86-gcc4-2012-09-03.zip
-                               : 
$(baseURL)/transmission-2.21-r1a4-x86-gcc4-2012-09-03.zip
+                               transmission-2.21-r1a4-x86-gcc4-2012-09-12.zip
+                               : 
$(baseURL)/transmission-2.21-r1a4-x86-gcc4-2012-09-12.zip
                                : : true ;
                } else {
                        InstallOptionalHaikuImagePackage


Other related posts:

  • » [haiku-commits] haiku: hrev44629 - build/jam - scott mc