[haiku-commits] BRANCH HaikuPM-github.package-management - build/jam data/system/boot src/bin/bash

  • From: HaikuPM-github.package-management <community@xxxxxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Mon, 22 Apr 2013 01:15:32 +0200 (CEST)

added 3 changesets to branch 'refs/remotes/HaikuPM-github/package-management'
old head: 5c01289f68d67772de21aa97655f420a0044b50e
new head: 083234daa2c6473bc11c03a46e8a8a5d73ca9000
overview: https://github.com/haiku/HaikuPM/compare/5c01289...083234d

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

4b30375: Update prerequired packages with current versions.

86b3c7a: Drop symlink common/develop/tools/current
  
  * drop the symlink itself (system development tools are now symlinked
    from /boot/common/bin directly)
  * remove that symlink from PATH

083234d: Drop legacy scripts 'cc' and 'c++'
  
  * no longer put compiler wrappers onto image
  * removed corresponding environment variables

                                    [ Oliver Tappe <zooey@xxxxxxxxxxxxxxx> ]

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

4 files changed, 12 insertions(+), 30 deletions(-)
build/jam/HaikuPackages           |  4 ++--
build/jam/OptionalPackages        | 19 +++++++------------
data/system/boot/SetupEnvironment | 16 ++--------------
src/bin/bash/config-top.h         |  3 +--

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

Commit:      4b303759d29f2ec2aa8ffb04c239bc071b4b3c7a
Author:      Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date:        Sun Apr 21 22:50:01 2013 UTC

Update prerequired packages with current versions.

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

diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 2034927..a9c6cbd 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -467,16 +467,16 @@ if [ IsOptionalHaikuImagePackageAdded Development ] && 
$(TARGET_ARCH) = x86 {
                        : : true ;
        } else {
                InstallOptionalHaikuImagePackage
-                       $(hpkgBaseURL)/autoconf-2.68-4-x86_gcc2.hpkg
+                       $(hpkgBaseURL)/autoconf-2.69-3-x86_gcc2.hpkg
                        : common packages ;
                InstallOptionalHaikuImagePackage
-                       $(hpkgBaseURL)/automake-1.11.1-4-x86_gcc2.hpkg
+                       $(hpkgBaseURL)/automake-1.13.1-3-x86_gcc2.hpkg
                        : common packages ;
                InstallOptionalHaikuImagePackage
                        $(hpkgBaseURL)/libtool-2.4-4-x86_gcc2.hpkg
                        : common packages ;
                InstallOptionalHaikuImagePackage
-                       $(hpkgBaseURL)/texinfo-4.13a-2-x86_gcc2.hpkg
+                       $(hpkgBaseURL)/texinfo-4.13a-4-x86_gcc2.hpkg
                        : common packages ;
        }
 }
@@ -488,10 +488,10 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ]
        # gcc and binutils
        if $(HAIKU_GCC_VERSION[1]) = 2 {
                InstallOptionalHaikuImagePackage
-                       $(hpkgBaseURL)/binutils-2.17_110711-2-x86_gcc2.hpkg
+                       $(hpkgBaseURL)/binutils-2.17_130421-1-x86_gcc2.hpkg
                        : common packages ;
                InstallOptionalHaikuImagePackage
-                       $(hpkgBaseURL)/gcc-2.95.3_110711-5-x86_gcc2.hpkg
+                       $(hpkgBaseURL)/gcc-2.95.3_130421-1-x86_gcc2.hpkg
                        : common packages ;
 
                # TODO: remove this when we have a mechanism to switch gcc via 
PATH
@@ -521,13 +521,13 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ]
                        $(baseURL)/make-3.82-r1a3-x86-gcc4-2011-05-23.zip ;
        } else {
                InstallOptionalHaikuImagePackage
-                       $(hpkgBaseURL)/bison-2.4.3-2-x86_gcc2.hpkg
+                       $(hpkgBaseURL)/bison-2.4.3-4-x86_gcc2.hpkg
                        : common packages ;
                InstallOptionalHaikuImagePackage
                        $(hpkgBaseURL)/m4-1.4.16-4-x86_gcc2.hpkg
                        : common packages ;
                InstallOptionalHaikuImagePackage
-                       $(hpkgBaseURL)/flex-2.5.35-2-x86_gcc2.hpkg
+                       $(hpkgBaseURL)/flex-2.5.35-4-x86_gcc2.hpkg
                        : common packages ;
                InstallOptionalHaikuImagePackage
                        $(hpkgBaseURL)/jam-2.5-1-x86_gcc2.hpkg

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

Commit:      86b3c7a4168ea52eb05587f83b6985b1ee9249af
Author:      Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date:        Sun Apr 21 22:56:02 2013 UTC

Drop symlink common/develop/tools/current

* drop the symlink itself (system development tools are now symlinked
  from /boot/common/bin directly)
* remove that symlink from PATH

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

diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index a9c6cbd..3d697c7 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -493,11 +493,6 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ]
                InstallOptionalHaikuImagePackage
                        $(hpkgBaseURL)/gcc-2.95.3_130421-1-x86_gcc2.hpkg
                        : common packages ;
-
-               # TODO: remove this when we have a mechanism to switch gcc via 
PATH
-               AddSymlinkToHaikuImage common settings develop tools
-                       : /boot/common/develop/tools/gcc-2.95.3-110711
-                       : current ;
        }
 
        if $(HAIKU_GCC_VERSION[1]) = 4 {
diff --git a/data/system/boot/SetupEnvironment 
b/data/system/boot/SetupEnvironment
index ad0a158..08198c1 100644
--- a/data/system/boot/SetupEnvironment
+++ b/data/system/boot/SetupEnvironment
@@ -8,9 +8,6 @@ export LC_CTYPE="en_US.UTF-8"
 
 BUILDHOME=/boot/system/develop
 
-#TODO: fix this or drop it!
-BETOOLS="/boot/common/settings/develop/tools/current/bin"
-
 case `uname -m` in
 BePC|Intel|unknown)
        BE_HOST_CPU=x86
@@ -29,7 +26,6 @@ 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 BETOOLS
 export BELIBRARIES
 export BEINCLUDES
 export BE_HOST_CPU
@@ -44,11 +40,11 @@ export BE_DEFAULT_CPLUS_FLAGS=""
 
 if [ "$SAFEMODE" != "yes" ]
 then
-       export 
PATH=.:$HOME/config/non-packaged/bin:$HOME/config/bin:/boot/common/non-packaged/bin:/boot/common/bin:/bin:/boot/apps:/boot/preferences:/boot/system/apps:/boot/system/preferences:$BETOOLS
+       export 
PATH=.:$HOME/config/non-packaged/bin:$HOME/config/bin:/boot/common/non-packaged/bin:/boot/common/bin:/bin:/boot/apps:/boot/preferences:/boot/system/apps:/boot/system/preferences
        export 
LIBRARY_PATH="%A/lib:$HOME/config/non-packaged/lib:$HOME/config/lib:/boot/common/non-packaged/lib:/boot/common/lib:/boot/system/lib"
        export 
ADDON_PATH="%A/add-ons:$HOME/config/non-packaged/add-ons:$HOME/config/add-ons:/boot/common/non-packaged/add-ons:/boot/common/add-ons:/boot/system/add-ons"
 else
-       export 
PATH=.:/bin:/boot/apps:/boot/system/apps:/boot/system/preferences:$BETOOLS
+       export PATH=.:/bin:/boot/apps:/boot/system/apps:/boot/system/preferences
        export LIBRARY_PATH="%A/lib:/boot/system/lib"
        export ADDON_PATH="%A/add-ons:/boot/system/add-ons"
 fi
diff --git a/src/bin/bash/config-top.h b/src/bin/bash/config-top.h
index 9b7d17e..66c4676 100644
--- a/src/bin/bash/config-top.h
+++ b/src/bin/bash/config-top.h
@@ -56,8 +56,7 @@
 #define DEFAULT_PATH_VALUE \
   ".:/boot/home/config/bin:/bin:/boot/apps:/boot/preferences" \
   ":/boot/system/apps" \
-  ":/boot/system/preferences" \
-  ":/boot/common/settings/develop/tools/current/bin"
+  ":/boot/system/preferences" 
 #endif
 
 /* The value for PATH when invoking `command -p'.  This is only used when

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

Commit:      083234daa2c6473bc11c03a46e8a8a5d73ca9000
Author:      Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date:        Sun Apr 21 23:00:36 2013 UTC

Drop legacy scripts 'cc' and 'c++'

* no longer put compiler wrappers onto image
* removed corresponding environment variables

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

diff --git a/build/jam/HaikuPackages b/build/jam/HaikuPackages
index 896cdcd..cae0a18 100644
--- a/build/jam/HaikuPackages
+++ b/build/jam/HaikuPackages
@@ -401,8 +401,8 @@ AddFilesToPackage $(developDirTokens) lib : 
libposix_error_mapper.a ;
 
 # ABI independent stuff
 
-# scripts: cc and c++ wrapper, freetype-config, setgcc
-local scripts = cc c++ freetype-config setgcc ;
+# scripts: freetype-config, setgcc
+local scripts = freetype-config setgcc ;
 SEARCH on $(scripts) = [ FDirName $(HAIKU_TOP) data bin ] ;
 AddFilesToPackage bin : $(scripts) ;
 
diff --git a/data/system/boot/SetupEnvironment 
b/data/system/boot/SetupEnvironment
index 08198c1..b4da8e6 100644
--- a/data/system/boot/SetupEnvironment
+++ b/data/system/boot/SetupEnvironment
@@ -30,14 +30,6 @@ export BELIBRARIES
 export BEINCLUDES
 export BE_HOST_CPU
 
-# for the "cc" and "ld" shell scripts
-
-export BE_C_COMPILER=gcc
-export BE_CPLUS_COMPILER="g++"
-export BE_LINKER=ld
-export BE_DEFAULT_C_FLAGS=""
-export BE_DEFAULT_CPLUS_FLAGS=""
-
 if [ "$SAFEMODE" != "yes" ]
 then
        export 
PATH=.:$HOME/config/non-packaged/bin:$HOME/config/bin:/boot/common/non-packaged/bin:/boot/common/bin:/bin:/boot/apps:/boot/preferences:/boot/system/apps:/boot/system/preferences


Other related posts:

  • » [haiku-commits] BRANCH HaikuPM-github.package-management - build/jam data/system/boot src/bin/bash - HaikuPM-github . package-management