[haiku-commits] BRANCH weinhold-github.pm-flat - build/jam src/data/package_infos

  • From: weinhold-github.pm-flat <community@xxxxxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Thu, 28 Mar 2013 00:30:35 +0100 (CET)

added 2 changesets to branch 'refs/remotes/weinhold-github/pm-flat'
old head: 4e87ae1bbe89b24986fc1deab35d4dc0ad2cc5a2
new head: 90692f47f7132ef806aef9e210684520d91f2a4f
overview: https://github.com/weinhold/Haiku/compare/4e87ae1...90692f4

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

7105134: haiku package info: Add more provided resolvable
  
  Also add a compat version to a few.

90692f4: Rebuilt packages required for bootstrapping

                                    [ Ingo Weinhold <ingo_weinhold@xxxxxx> ]

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

2 files changed, 30 insertions(+), 22 deletions(-)
build/jam/OptionalPackages   | 40 ++++++++++++++++++++--------------------
src/data/package_infos/haiku | 12 ++++++++++--

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

Commit:      71051342011e696954083d95c00a9402d0ba22b5
Author:      Ingo Weinhold <ingo_weinhold@xxxxxx>
Date:        Thu Mar 28 00:17:37 2013 UTC

haiku package info: Add more provided resolvable

Also add a compat version to a few.

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

diff --git a/src/data/package_infos/haiku b/src/data/package_infos/haiku
index 30a02e2..8dbcb88 100644
--- a/src/data/package_infos/haiku
+++ b/src/data/package_infos/haiku
@@ -17,11 +17,19 @@ licenses {
 
 provides {
        haiku=R1-alpha3_pm-1 compat>=R1-alpha1
+       coreutils=8.4 compat>=0.0
+       diffutils=2.8.1 compat>=0.0
+       findutils=4.2.33 compat>=0.0
        cmd:awk=0.0.0
+       cmd:cp=8.4 compat>=0.0
+       cmd:diff=2.8.1 compat>=0.0
+       cmd:find=4.2.33 compat>=0.0
+       cmd:ln=8.4 compat>=0.0
+       cmd:mv=8.4 compat>=0.0
        cmd:sh=0.0.0
-       cmd:unzip=5.50
+       cmd:unzip=5.50 compat>=0.0
        cmd:wget=0.0.0
-       cmd:zip=2.32
+       cmd:zip=2.32 compat>=0.0
 }
 
 requires {

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

Commit:      90692f47f7132ef806aef9e210684520d91f2a4f
Author:      Ingo Weinhold <ingo_weinhold@xxxxxx>
Date:        Thu Mar 28 00:20:23 2013 UTC

Rebuilt packages required for bootstrapping

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

diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index e45742f..0707506 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -496,20 +496,20 @@ if [ IsOptionalHaikuImagePackageAdded Development ] && 
$(TARGET_ARCH) = x86 {
                        : : true ;
        } else {
                InstallOptionalHaikuImagePackage
-                       autoconf-2.68-1-x86_gcc2.hpkg
-                       : $(hpkgBaseURL)/autoconf-2.68-1-x86_gcc2.hpkg
+                       autoconf-2.68-2-x86_gcc2.hpkg
+                       : $(hpkgBaseURL)/autoconf-2.68-2-x86_gcc2.hpkg
                        : common packages ;
                InstallOptionalHaikuImagePackage
-                       automake-1.11.1-1-x86_gcc2.hpkg
-                       : $(hpkgBaseURL)/automake-1.11.1-1-x86_gcc2.hpkg
+                       automake-1.11.1-2-x86_gcc2.hpkg
+                       : $(hpkgBaseURL)/automake-1.11.1-2-x86_gcc2.hpkg
                        : common packages ;
                InstallOptionalHaikuImagePackage
-                       libtool-2.4-1-x86_gcc2.hpkg
-                       : $(hpkgBaseURL)/libtool-2.4-1-x86_gcc2.hpkg
+                       libtool-2.4-2-x86_gcc2.hpkg
+                       : $(hpkgBaseURL)/libtool-2.4-2-x86_gcc2.hpkg
                        : common packages ;
                InstallOptionalHaikuImagePackage
-                       texinfo-4.13a-1-x86_gcc2.hpkg
-                       : $(hpkgBaseURL)/texinfo-4.13a-1-x86_gcc2.hpkg
+                       texinfo-4.13a-2-x86_gcc2.hpkg
+                       : $(hpkgBaseURL)/texinfo-4.13a-2-x86_gcc2.hpkg
                        : common packages ;
        }
 }
@@ -520,8 +520,8 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ]
                && $(TARGET_ARCH) = x86 {
        # gcc and binutils
        if $(HAIKU_GCC_VERSION[1]) = 2 {
-               InstallOptionalHaikuImagePackage 
gcc-2.95.3_110711-1-x86_gcc2.hpkg
-                       : $(hpkgBaseURL)/gcc-2.95.3_110711-1-x86_gcc2.hpkg
+               InstallOptionalHaikuImagePackage 
gcc-2.95.3_110711-2-x86_gcc2.hpkg
+                       : $(hpkgBaseURL)/gcc-2.95.3_110711-2-x86_gcc2.hpkg
                        : common packages ;
 
                # TODO: remove this when we have a mechanism to switch gcc via 
PATH
@@ -558,16 +558,16 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ]
                        : $(baseURL)/make-3.82-r1a3-x86-gcc4-2011-05-23.zip ;
        } else {
                InstallOptionalHaikuImagePackage
-                       bison-2.4.3-1-x86_gcc2.hpkg
-                       : $(hpkgBaseURL)/bison-2.4.3-1-x86_gcc2.hpkg
+                       bison-2.4.3-2-x86_gcc2.hpkg
+                       : $(hpkgBaseURL)/bison-2.4.3-2-x86_gcc2.hpkg
                        : common packages ;
                InstallOptionalHaikuImagePackage
-                       m4-1.4.16-1-x86_gcc2.hpkg
-                       : $(hpkgBaseURL)/m4-1.4.16-1-x86_gcc2.hpkg
+                       m4-1.4.16-2-x86_gcc2.hpkg
+                       : $(hpkgBaseURL)/m4-1.4.16-2-x86_gcc2.hpkg
                        : common packages ;
                InstallOptionalHaikuImagePackage
-                       flex-2.5.35-1-x86_gcc2.hpkg
-                       : $(hpkgBaseURL)/flex-2.5.35-1-x86_gcc2.hpkg
+                       flex-2.5.35-2-x86_gcc2.hpkg
+                       : $(hpkgBaseURL)/flex-2.5.35-2-x86_gcc2.hpkg
                        : common packages ;
                InstallOptionalHaikuImagePackage
                        jam-2.5-1-x86_gcc2.hpkg
@@ -578,8 +578,8 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ]
                        : $(hpkgBaseURL)/mkdepend-1.7-1-x86_gcc2.hpkg
                        : common packages ;
                InstallOptionalHaikuImagePackage
-                       make-3.82-1-x86_gcc2.hpkg
-                       : $(hpkgBaseURL)/make-3.82-1-x86_gcc2.hpkg
+                       make-3.82-2-x86_gcc2.hpkg
+                       : $(hpkgBaseURL)/make-3.82-2-x86_gcc2.hpkg
                        : common packages ;
        }
 }
@@ -1288,8 +1288,8 @@ if [ IsOptionalHaikuImagePackageAdded Perl ] {
                                : : true ;
                } else {
                        InstallOptionalHaikuImagePackage
-                               perl-5.10.1-1-x86_gcc2.hpkg
-                               : $(hpkgBaseURL)/perl-5.10.1-1-x86_gcc2.hpkg
+                               perl-5.10.1-2-x86_gcc2.hpkg
+                               : $(hpkgBaseURL)/perl-5.10.1-2-x86_gcc2.hpkg
                                : common packages ;
                }
        }


Other related posts: