From owner-svn-src-projects@FreeBSD.ORG Sun Jun 2 05:57:46 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 3B254C52; Sun, 2 Jun 2013 05:57:46 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 2CB8F18D1; Sun, 2 Jun 2013 05:57:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r525vkPY027251; Sun, 2 Jun 2013 05:57:46 GMT (envelope-from jhibbits@svn.freebsd.org) Received: (from jhibbits@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r525vktw027250; Sun, 2 Jun 2013 05:57:46 GMT (envelope-from jhibbits@svn.freebsd.org) Message-Id: <201306020557.r525vktw027250@svn.freebsd.org> From: Justin Hibbits Date: Sun, 2 Jun 2013 05:57:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r251243 - projects/pmac_pmu/sys/powerpc/mambo X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Jun 2013 05:57:46 -0000 Author: jhibbits Date: Sun Jun 2 05:57:45 2013 New Revision: 251243 URL: http://svnweb.freebsd.org/changeset/base/251243 Log: Fix build for mambo. Modified: projects/pmac_pmu/sys/powerpc/mambo/mambo_openpic.c Modified: projects/pmac_pmu/sys/powerpc/mambo/mambo_openpic.c ============================================================================== --- projects/pmac_pmu/sys/powerpc/mambo/mambo_openpic.c Sun Jun 2 05:45:25 2013 (r251242) +++ projects/pmac_pmu/sys/powerpc/mambo/mambo_openpic.c Sun Jun 2 05:57:45 2013 (r251243) @@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include "pic_if.h" From owner-svn-src-projects@FreeBSD.ORG Tue Jun 4 15:25:58 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 587F8D5D; Tue, 4 Jun 2013 15:25:58 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 4B57618C4; Tue, 4 Jun 2013 15:25:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r54FPwiC044447; Tue, 4 Jun 2013 15:25:58 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r54FPw9X044446; Tue, 4 Jun 2013 15:25:58 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201306041525.r54FPw9X044446@svn.freebsd.org> From: "Simon J. Gerraty" Date: Tue, 4 Jun 2013 15:25:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r251379 - projects/bmake/share/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Jun 2013 15:25:58 -0000 Author: sjg Date: Tue Jun 4 15:25:57 2013 New Revision: 251379 URL: http://svnweb.freebsd.org/changeset/base/251379 Log: Include more stuff within the meta mode block, so that buildworld can function normally. Submitted by: John Van Horne Modified: projects/bmake/share/mk/local.sys.mk Modified: projects/bmake/share/mk/local.sys.mk ============================================================================== --- projects/bmake/share/mk/local.sys.mk Tue Jun 4 14:38:50 2013 (r251378) +++ projects/bmake/share/mk/local.sys.mk Tue Jun 4 15:25:57 2013 (r251379) @@ -227,11 +227,6 @@ UPDATE_DEPENDFILE= NO .MAKE.META.BAILIWICK = ${SB} ${OBJROOT} ${STAGE_ROOT} -.endif # meta mode - -# ensure we have a value -.MAKE.MODE ?= normal - # don't rely on MACHINE_ARCH being set or valid MACHINE_ARCH.host = ${_HOST_ARCH} @@ -242,6 +237,11 @@ CSU_DIR.i386 = csu/i386-elf CSU_DIR.${MACHINE_ARCH} ?= csu/${MACHINE_ARCH} CSU_DIR := ${CSU_DIR.${MACHINE_ARCH}} +.endif # meta mode + +# ensure we have a value +.MAKE.MODE ?= normal + MAKE_PRINT_VAR_ON_ERROR+= \ .CURDIR \ .MAKE \ From owner-svn-src-projects@FreeBSD.ORG Tue Jun 4 15:27:10 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 17182E89; Tue, 4 Jun 2013 15:27:10 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E4ECF18CF; Tue, 4 Jun 2013 15:27:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r54FR9Uf044671; Tue, 4 Jun 2013 15:27:09 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r54FR9hE044670; Tue, 4 Jun 2013 15:27:09 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201306041527.r54FR9hE044670@svn.freebsd.org> From: "Simon J. Gerraty" Date: Tue, 4 Jun 2013 15:27:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r251380 - projects/bmake X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Jun 2013 15:27:10 -0000 Author: sjg Date: Tue Jun 4 15:27:09 2013 New Revision: 251380 URL: http://svnweb.freebsd.org/changeset/base/251380 Log: Remove external/bsd (not in this branch yet). Modified: projects/bmake/Makefile.inc1 Modified: projects/bmake/Makefile.inc1 ============================================================================== --- projects/bmake/Makefile.inc1 Tue Jun 4 15:25:57 2013 (r251379) +++ projects/bmake/Makefile.inc1 Tue Jun 4 15:27:09 2013 (r251380) @@ -91,7 +91,6 @@ SUBDIR+=sys usr.bin usr.sbin .if ${MK_OFED} != "no" SUBDIR+=contrib/ofed .endif -SUBDIR+=external/bsd # # We must do etc/ last for install/distribute to work. From owner-svn-src-projects@FreeBSD.ORG Tue Jun 4 15:27:41 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id A4CC5FA9; Tue, 4 Jun 2013 15:27:41 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9814E18D3; Tue, 4 Jun 2013 15:27:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r54FRfrh044777; Tue, 4 Jun 2013 15:27:41 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r54FRflM044776; Tue, 4 Jun 2013 15:27:41 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201306041527.r54FRflM044776@svn.freebsd.org> From: "Simon J. Gerraty" Date: Tue, 4 Jun 2013 15:27:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r251381 - projects/bmake X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Jun 2013 15:27:41 -0000 Author: sjg Date: Tue Jun 4 15:27:41 2013 New Revision: 251381 URL: http://svnweb.freebsd.org/changeset/base/251381 Log: Ensure this makefile and anything it runs, does so without meta mode. Allows buildworld etc. Modified: projects/bmake/Makefile Modified: projects/bmake/Makefile ============================================================================== --- projects/bmake/Makefile Tue Jun 4 15:27:09 2013 (r251380) +++ projects/bmake/Makefile Tue Jun 4 15:27:41 2013 (r251381) @@ -458,3 +458,11 @@ universe_epilogue: buildLINT: ${MAKE} -C ${.CURDIR}/sys/${_TARGET}/conf LINT + +.if defined(.PARSEDIR) +# this makefile does not run in meta mode +.MAKE.MODE= normal +# make sure things we run from here don't either +WITHOUT_META_MODE= +.export WITHOUT_META_MODE +.endif