[haiku-commits] BRANCH HaikuPM-github.package-management [7d09a8d] build/jam src/tools/package_repo

From: HaikuPM-github.package-management <community@xxxxxxxxxxxx>
To: haiku-commits@xxxxxxxxxxxxx
Date: Wed, 18 Sep 2013 16:00:33 +0200 (CEST)
added 2 changesets to branch 'refs/remotes/HaikuPM-github/package-management'
old head: d7cbcb13da916672fa94b06451dc3ec344a432b2
new head: 7d09a8dc6788de70bc30da84e6feb9b006c46bfb
overview: https://github.com/haiku/HaikuPM/compare/d7cbcb1...7d09a8d

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

53b1625: Fix host-only build.

                                    [ Ingo Weinhold <ingo_weinhold@xxxxxx> ]

7d09a8d: Fix build of '<build>package_repo' for real.
  
  * add missing command_update.cpp

                                    [ Oliver Tappe <zooey@xxxxxxxxxxxxxxx> ]

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

3 files changed, 8 insertions(+), 2 deletions(-)
build/jam/BuildSetup           | 6 ++++--
build/jam/HelperRules          | 3 +++
src/tools/package_repo/Jamfile | 1 +

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

Commit:      53b162523f35ee9c2ba4c67e8fcbf59201d0f491
Author:      Ingo Weinhold <ingo_weinhold@xxxxxx>
Date:        Wed Sep 18 13:26:35 2013 UTC
Committer:   Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Commit-Date: Wed Sep 18 13:41:12 2013 UTC

Fix host-only build.

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

diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index f5a8295..1abbfe4 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -243,6 +243,7 @@ HOST_UNARFLAGS              ?= x ;
 # check the host platform compatibility
 SetPlatformCompatibilityFlagVariables HOST_PLATFORM : HOST : host
        : linux openbsd freebsd darwin sunos cygwin ;
+HOST_PLATFORM_(host)_COMPATIBLE = 1 ;
 
 if $(HOST_PLATFORM) = linux || $(HOST_PLATFORM) = freebsd
        || $(HOST_PLATFORM) = darwin || $(HOST_PLATFORM) = cygwin
@@ -265,15 +266,16 @@ if $(HOST_PLATFORM) = cygwin {
                --enable-auto-import ;
 }
 
-HOST_CPU       ?= $(OSPLAT:L) ;
+HOST_CPU ?= $(OSPLAT:L) ;
 
 # Jam doesn't know x86_64, so override HOST_CPU, if 64 bit.
 if $(HOST_CPU) = x86 && $(HOST_PLATFORM_IS_64_BIT) {
        HOST_CPU = x86_64 ;
 }
 
-HOST_ARCH                              ?= $(HOST_CPU) ;
+HOST_ARCH ?= $(HOST_CPU) ;
 HOST_ARCHS = $(HOST_ARCH) ;
+HOST_KERNEL_ARCH = host ;
 
 # analyze GCC version
 HOST_GCC_VERSION = [ FAnalyzeGCCVersion HOST_GCC_RAW_VERSION ] ;
diff --git a/build/jam/HelperRules b/build/jam/HelperRules
index 4519703..31d05f2 100644
--- a/build/jam/HelperRules
+++ b/build/jam/HelperRules
@@ -207,6 +207,9 @@ rule SetPlatformCompatibilityFlagVariables
                        $(varPrefix)_PLATFORM_HAIKU_COMPATIBLE = true ;
                }
 
+               case host :
+                       # not compatible to anything
+
                case * :
                {
                        if ! ( $(platform) in $(otherPlatforms) ) {

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

Commit:      7d09a8dc6788de70bc30da84e6feb9b006c46bfb
Author:      Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date:        Wed Sep 18 13:42:36 2013 UTC

Fix build of '<build>package_repo' for real.

* add missing command_update.cpp

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

diff --git a/src/tools/package_repo/Jamfile b/src/tools/package_repo/Jamfile
index 3de9559..2331ccf 100644
--- a/src/tools/package_repo/Jamfile
+++ b/src/tools/package_repo/Jamfile
@@ -12,6 +12,7 @@ USES_BE_API on <build>package_repo = true ;
 BuildPlatformMain <build>package_repo :
        command_create.cpp
        command_list.cpp
+       command_update.cpp
        package_repo.cpp
        :
        libpackage_build.so $(HOST_LIBBE) $(HOST_LIBSUPC++) $(HOST_LIBSTDC++)
[haiku-commits] BRANCH HaikuPM-github.package-management [7d09a8d] build/jam src/tools/package_repo

Other related posts:
