From owner-svn-src-stable-9@FreeBSD.ORG  Sun Jun 24 17:02:29 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 861241065676;
	Sun, 24 Jun 2012 17:02:29 +0000 (UTC)
	(envelope-from luigi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 57F438FC17;
	Sun, 24 Jun 2012 17:02:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5OH2T4H021238;
	Sun, 24 Jun 2012 17:02:29 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5OH2Tvv021236;
	Sun, 24 Jun 2012 17:02:29 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201206241702.q5OH2Tvv021236@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Sun, 24 Jun 2012 17:02:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237536 - stable/9/release/picobsd/build
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Jun 2012 17:02:29 -0000

Author: luigi
Date: Sun Jun 24 17:02:28 2012
New Revision: 237536
URL: http://svn.freebsd.org/changeset/base/237536

Log:
  partial MFC. Mostly, do not build clang when initializing picobsd

Modified:
  stable/9/release/picobsd/build/picobsd

Modified: stable/9/release/picobsd/build/picobsd
==============================================================================
--- stable/9/release/picobsd/build/picobsd	Sun Jun 24 16:56:48 2012	(r237535)
+++ stable/9/release/picobsd/build/picobsd	Sun Jun 24 17:02:28 2012	(r237536)
@@ -164,6 +164,7 @@ create_includes_and_libraries2() { # opt
     log "create_includes_and_libraries2() for ${SRC} $1"
     if [ ${OSVERSION} -ge 600000 ] ; then
 	no="-DNO_CLEAN -DNO_PROFILE -DNO_GAMES -DNO_LIBC_R" # WITHOUT_CDDL=1"
+	no="$no -DWITHOUT_CLANG"
     else
 	no="-DNOCLEAN -DNOPROFILE -DNOGAMES -DNOLIBC_R"
     fi
@@ -441,7 +442,7 @@ do_kernel() {		# OK
 	[ "${o_do_modules}" = "yes" ] && export MODULES=""
 	${BINMAKE} ${o_par} KERNCONF=${l_kernconf}	\
 		-v -f ${PICO_TREE}/build/Makefile.conf ) || \
-	fail $? missing_kernel
+	    fail $? missing_kernel
 }
 
 # Populate the variable part of the floppy filesystem. Must be done before
@@ -591,7 +592,7 @@ find_progs() {	# programs
 		if [ "$old_libs" = "$i" ] ; then
 			log "libraries for: $my_progs ($u_progs) are ($i) $u_libs"
 			log "--- done find_progs ---"
-	return 0
+			return 0
 		else
 			# logverbose "old--- $old_libs --- new +++ $i +++"
 		fi
@@ -881,11 +882,11 @@ fill_floppy_image() {
     fi
     log "Compress with kgzip and copy to floppy image"
 
-	mkdir -p  ${dst}/boot/kernel
+    mkdir -p  ${dst}/boot/kernel
     # XXX update loader.conf
-	echo "hint.acpi.0.disabled=\"1\"" > ${dst}/boot/loader.conf
-	echo "console=\"comconsole\"" >> ${dst}/boot/loader.conf
-	cp -p /boot/loader ${dst}/boot/loader || fail $? no_space "copying bootloader"
+    echo "hint.acpi.0.disabled=\"1\"" > ${dst}/boot/loader.conf
+    echo "console=\"comconsole\"" >> ${dst}/boot/loader.conf
+    cp -p /boot/loader ${dst}/boot/loader || fail $? no_space "copying bootloader"
     gzip -c kernel > ${dst}/boot/kernel/kernel.gz || fail $? no_space "copying kernel"
 
     # now transfer the floppy tree. If it is already in mfs, dont bother.