Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 9 Jun 2017 03:34:38 +0000 (UTC)
From:      Phil Shafer <phil@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org
Subject:   svn commit: r319732 - vendor/Juniper/libxo
Message-ID:  <201706090334.v593YcnR047127@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: phil
Date: Fri Jun  9 03:34:38 2017
New Revision: 319732
URL: https://svnweb.freebsd.org/changeset/base/319732

Log:
  Fix import.sh w/ new $BUILDWORLD
  
  Submitted by:	phil

Modified:
  vendor/Juniper/libxo/import.sh

Modified: vendor/Juniper/libxo/import.sh
==============================================================================
--- vendor/Juniper/libxo/import.sh	Fri Jun  9 03:32:49 2017	(r319731)
+++ vendor/Juniper/libxo/import.sh	Fri Jun  9 03:34:38 2017	(r319732)
@@ -14,6 +14,8 @@
 
 PROJECT=libxo
 
+BUILDWORLD="make -j8 buildworld -DWITH_META_MODE -DNO_CLEAN -DWITHOUT_TESTS"
+
 #"global" vars
 # Set SVN variables
 #  select the local subversion site
@@ -148,6 +150,7 @@ fi
 info "CWD = $CWD"
 info "VENDOR_DIR = $VENDOR_DIR"
 info "VERS = $VERS"
+info "BUILDWORLD = $BUILDWORLD"
 DATESTAMP=`date "+%Y-%m-%d-%H-%M"`
 
 [ -z "$VERS" ] && Error "missing version argument (-v)"
@@ -158,7 +161,7 @@ Cd $HEAD
 run "updating all" "svn update"
 
 if [ ! -z "$UPDATE" ]; then
-    run "building the entire world" "script $MAKEOBJDIRPREFIX/out.$DATESTAMP.before make -DNO_CLEAN MK_TESTS=no buildworld"
+    run "building the entire world" "script $MAKEOBJDIRPREFIX/out.$DATESTAMP.before $BUILDWORLD"
 fi
 
 Cd $CWD
@@ -299,7 +302,7 @@ run "copying add.man" "(echo '.\\\" \$FreeBSD\$' ; cat
     #run "making build dir '$dir'" "make LIBXOSRC=$CWD/dist"
 #done
 
-run "building the entire world" "script $MAKEOBJDIRPREFIX/out.$DATESTAMP make -DNO_CLEAN MK_TESTS=no buildworld LIBXOSRC=$CWD/dist"
+run "building the entire world" "script $MAKEOBJDIRPREFIX/out.$DATESTAMP $BUILDWORLD LIBXOSRC=$CWD/dist"
 
 # Okay, so now it all builds!!  Now we can start committing....
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706090334.v593YcnR047127>