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

From: js-haiku-commits@xxxxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Sun, 26 Oct 2014 21:08:06 +0100 (CET)
hrev48105 adds 1 changeset to branch 'master'
old head: c0e645210adad35c956856f919f87a855dd9fb8f
new head: c9dd05ff400733baf569ee023c05d48fdbcf4ef1
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=c9dd05f+%5Ec0e6452

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

c9dd05f: configure: Add variable to see if we're bootstrapping

                                     [ Jonathan Schleifer <js@xxxxxxxxxxx> ]

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

Revision:    hrev48105
Commit:      c9dd05ff400733baf569ee023c05d48fdbcf4ef1
URL:         http://cgit.haiku-os.org/haiku/commit/?id=c9dd05f
Author:      Jonathan Schleifer <js@xxxxxxxxxxx>
Date:        Sun Oct 26 20:07:01 2014 UTC

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

2 files changed, 5 insertions(+), 1 deletion(-)
build/jam/RepositoryRules | 2 +-
configure                 | 4 ++++

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

diff --git a/build/jam/RepositoryRules b/build/jam/RepositoryRules
index d5d2450..fb91089 100644
--- a/build/jam/RepositoryRules
+++ b/build/jam/RepositoryRules
@@ -43,7 +43,7 @@ rule AddRepositoryPackage repository : architecture : 
baseName : version
                : $(baseName) ] ;
        baseName = $(packageFamily:G=) ;
 
-       if $(HAIKU_NO_DOWNLOADS) = 1 && $(HAIKU_BUILD_TYPE) != bootstrap {
+       if $(HAIKU_NO_DOWNLOADS) = 1 && $(HAIKU_IS_BOOTSTRAP) != 1 {
                # Only add packages to repository that already exist in download
                # directory.
                if ! [ Glob $(HAIKU_DOWNLOAD_DIR) : $(packageFileName) ] {
diff --git a/configure b/configure
index a5b4acd..c5aaf30 100755
--- a/configure
+++ b/configure
@@ -451,6 +451,7 @@ HOST_SHA256=
 HOST_HAIKU_PORTER=
 HAIKU_PORTS=
 HAIKU_PORTS_CROSS=
+HAIKU_IS_BOOTSTRAP=0
 HAIKU_BOOT_BOARD=
 HAIKU_NO_DOWNLOADS=0
 
@@ -524,6 +525,8 @@ while [ $# -gt 0 ] ; do
                        HOST_HAIKU_PORTER="`absolute_path $2`"
                        HAIKU_PORTS_CROSS="`absolute_path $3`"
                        HAIKU_PORTS="`absolute_path $4`"
+                       HAIKU_IS_BOOTSTRAP=1
+                       HAIKU_NO_DOWNLOADS=1
                        check_file_exists "$HOST_HAIKU_PORTER" || (
                                echo "Invalid path to haikuporter: 
$HOST_HAIKU_PORTER" >&2
                                exit 1
@@ -882,6 +885,7 @@ HOST_SHA256                                 ?= 
${HOST_SHA256} ;
 HOST_HAIKU_PORTER                      ?= ${HOST_HAIKU_PORTER} ;
 HAIKU_PORTS                                    ?= ${HAIKU_PORTS} ;
 HAIKU_PORTS_CROSS                      ?= ${HAIKU_PORTS_CROSS} ;
+HAIKU_IS_BOOTSTRAP                     ?= ${HAIKU_IS_BOOTSTRAP} ;
 
 EOF
[haiku-commits] haiku: hrev48105 - build/jam

Other related posts:
