[haiku-commits] BRANCH HaikuPM-github.package-management [44f6033] build/jam data/system/boot

  • From: HaikuPM-github.package-management <community@xxxxxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Thu, 25 Apr 2013 20:00:46 +0200 (CEST)

added 2 changesets to branch 'refs/remotes/HaikuPM-github/package-management'
old head: db88e4417b9247dd8021108296930f974bf35bcc
new head: 44f60330e1abc910883e463b3331c4d952807a59
overview: https://github.com/haiku/HaikuPM/compare/db88e44...44f6033

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

8e452bc: Update gcc, ncurses, and nano packages

44f6033: SetupEnvironment: Remove BELIBRARIES
  
  It is no longer needed with the current gcc 2 package.

                                    [ Ingo Weinhold <ingo_weinhold@xxxxxx> ]

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

3 files changed, 5 insertions(+), 7 deletions(-)
build/jam/OptionalPackageDependencies | 1 +
build/jam/OptionalPackages            | 6 +++---
data/system/boot/SetupEnvironment     | 5 +----

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

Commit:      8e452bcfc774196f96da51880b5c77d860c425b3
Author:      Ingo Weinhold <ingo_weinhold@xxxxxx>
Date:        Thu Apr 25 15:59:02 2013 UTC

Update gcc, ncurses, and nano packages

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

diff --git a/build/jam/OptionalPackageDependencies 
b/build/jam/OptionalPackageDependencies
index 7a721eb..cd5479e 100644
--- a/build/jam/OptionalPackageDependencies
+++ b/build/jam/OptionalPackageDependencies
@@ -22,6 +22,7 @@ OptionalPackageDependencies Man : Groff ;
 OptionalPackageDependencies Tar : LibIconv ;
 OptionalPackageDependencies Python : Bzip ;
 OptionalPackageDependencies Mercurial : Python ;
+OptionalPackageDependencies Nano : NCurses ;
 OptionalPackageDependencies Neon : LibXML2 ;
 OptionalPackageDependencies NetFS : UserlandFS ;
 OptionalPackageDependencies NetSurf : OpenSSL Curl LibXML2 LibIconv Libmng ;
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index d14c4d4..d2e2507 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -491,7 +491,7 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ]
                        $(hpkgBaseURL)/binutils-2.17_130421-1-x86_gcc2.hpkg
                        : common packages ;
                InstallOptionalHaikuImagePackage
-                       $(hpkgBaseURL)/gcc-2.95.3_130421-1-x86_gcc2.hpkg
+                       $(hpkgBaseURL)/gcc-2.95.3_130425-1-x86_gcc2.hpkg
                        : common packages ;
        }
 
@@ -967,7 +967,7 @@ if [ IsOptionalHaikuImagePackageAdded Nano ] {
                                
$(baseURL)/nano-2.2.6-r1a3-x86-gcc4-2011-05-24.zip ;
                } else {
                        InstallOptionalHaikuImagePackage
-                               $(hpkgBaseURL)/nano-2.2.6-1-x86_gcc2.hpkg
+                               $(hpkgBaseURL)/nano-2.2.6-2-x86_gcc2.hpkg
                                : common packages ;
                }
        }
@@ -983,7 +983,7 @@ if [ IsOptionalHaikuImagePackageAdded Nano ] {
                        Echo "No optional package NCurses available for gcc 4" ;
                } else {
                        InstallOptionalHaikuImagePackage
-                               $(hpkgBaseURL)/ncurses-5.9-3-x86_gcc2.hpkg
+                               $(hpkgBaseURL)/ncurses-5.9-4-x86_gcc2.hpkg
                                : common packages ;
                }
        }

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

Commit:      44f60330e1abc910883e463b3331c4d952807a59
Author:      Ingo Weinhold <ingo_weinhold@xxxxxx>
Date:        Thu Apr 25 16:00:08 2013 UTC

SetupEnvironment: Remove BELIBRARIES

It is no longer needed with the current gcc 2 package.

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

diff --git a/data/system/boot/SetupEnvironment 
b/data/system/boot/SetupEnvironment
index b4da8e6..cc34c8c 100644
--- a/data/system/boot/SetupEnvironment
+++ b/data/system/boot/SetupEnvironment
@@ -19,14 +19,11 @@ BeMac|BeBox)
        BE_HOST_CPU=unknown
 esac
 
-BELIBRARIES="/boot/common/non-packaged/lib:/boot/common/lib:$BUILDHOME/lib"
-
-# not used by Haiku, but probably by legacy applications (BeIDE?)
+# not used by Haiku, but by (legacy) applications (e.g. Pe)
 BH=$BUILDHOME/headers
 
BEINCLUDES="$BH;$BH/be;$BH/posix;$BH/glibc;$BH/cpp;$BH/be/app;$BH/be/device;$BH/be/interface;$BH/be/locale;$BH/be/media;$BH/be/midi;$BH/be/midi2;$BH/be/net;$BH/be/kernel;$BH/be/storage;$BH/be/support;$BH/be/game;$BH/be/opengl;$BH/be/drivers;$BH/gnu;$BH/be/mail;$BH/be/translation;$BH/be/devel;$BH/be/add-ons/graphics;$BH/be/be_apps/Deskbar;$BH/be/be_apps/NetPositive;$BH/be/be_apps/Tracker"
 
 export BUILDHOME
-export BELIBRARIES
 export BEINCLUDES
 export BE_HOST_CPU
 


Other related posts:

  • » [haiku-commits] BRANCH HaikuPM-github.package-management [44f6033] build/jam data/system/boot - HaikuPM-github . package-management