Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 3 Apr 2015 02:27:41 +0000 (UTC)
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r281009 - in head/sys/boot: arm/uboot forth i386/loader mips/beri/loader pc98/loader powerpc/kboot powerpc/ofw sparc64/loader
Message-ID:  <201504030227.t332RfbB047958@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jkim
Date: Fri Apr  3 02:27:40 2015
New Revision: 281009
URL: https://svnweb.freebsd.org/changeset/base/281009

Log:
  Revert .PATH changes to fix mips build.
  
  Reported by:	bz
  Pointy hat to:	jkim

Modified:
  head/sys/boot/arm/uboot/Makefile
  head/sys/boot/forth/Makefile.inc
  head/sys/boot/i386/loader/Makefile
  head/sys/boot/mips/beri/loader/Makefile
  head/sys/boot/pc98/loader/Makefile
  head/sys/boot/powerpc/kboot/Makefile
  head/sys/boot/powerpc/ofw/Makefile
  head/sys/boot/sparc64/loader/Makefile

Modified: head/sys/boot/arm/uboot/Makefile
==============================================================================
--- head/sys/boot/arm/uboot/Makefile	Thu Apr  2 23:12:18 2015	(r281008)
+++ head/sys/boot/arm/uboot/Makefile	Fri Apr  3 02:27:40 2015	(r281009)
@@ -136,6 +136,7 @@ ldscript.generated::
 	fi
 
 .if !defined(LOADER_ONLY)
+.PATH: ${.CURDIR}/../../forth
 .include	"${.CURDIR}/../../forth/Makefile.inc"
 
 # Put sample loader.rc and menu.rc on disk but don't enable them

Modified: head/sys/boot/forth/Makefile.inc
==============================================================================
--- head/sys/boot/forth/Makefile.inc	Thu Apr  2 23:12:18 2015	(r281008)
+++ head/sys/boot/forth/Makefile.inc	Fri Apr  3 02:27:40 2015	(r281009)
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../forth
 FILES+=	beastie.4th
 FILES+=	brand.4th
 FILES+=	brand-fbsd.4th

Modified: head/sys/boot/i386/loader/Makefile
==============================================================================
--- head/sys/boot/i386/loader/Makefile	Thu Apr  2 23:12:18 2015	(r281008)
+++ head/sys/boot/i386/loader/Makefile	Fri Apr  3 02:27:40 2015	(r281009)
@@ -105,6 +105,7 @@ FILES=	${LOADER}
 FILESMODE_${LOADER}= ${BINMODE} -b
 
 .if !defined(LOADER_ONLY)
+.PATH: ${.CURDIR}/../../forth
 .include	"${.CURDIR}/../../forth/Makefile.inc"
 FILES+=	pcibios.4th
 

Modified: head/sys/boot/mips/beri/loader/Makefile
==============================================================================
--- head/sys/boot/mips/beri/loader/Makefile	Thu Apr  2 23:12:18 2015	(r281008)
+++ head/sys/boot/mips/beri/loader/Makefile	Fri Apr  3 02:27:40 2015	(r281009)
@@ -121,6 +121,7 @@ loader.help: help.common help.mips
 	cat ${.ALLSRC} | \
 	    awk -f ${.CURDIR}/../../../common/merge_help.awk > ${.TARGET}
 
+.PATH: ${.CURDIR}/../../../forth
 .include	"${.CURDIR}/../../forth/Makefile.inc"
 
 .if !exists(${DESTDIR}/boot/loader.rc)

Modified: head/sys/boot/pc98/loader/Makefile
==============================================================================
--- head/sys/boot/pc98/loader/Makefile	Thu Apr  2 23:12:18 2015	(r281008)
+++ head/sys/boot/pc98/loader/Makefile	Fri Apr  3 02:27:40 2015	(r281009)
@@ -86,6 +86,7 @@ FILES=	${LOADER}
 # XXX INSTALLFLAGS_loader= -b
 FILESMODE_${LOADER}= ${BINMODE} -b
 
+.PATH: ${.CURDIR}/../../forth
 .include	"${.CURDIR}/../../forth/Makefile.inc"
 
 .if !exists(${DESTDIR}/boot/loader.rc)

Modified: head/sys/boot/powerpc/kboot/Makefile
==============================================================================
--- head/sys/boot/powerpc/kboot/Makefile	Thu Apr  2 23:12:18 2015	(r281008)
+++ head/sys/boot/powerpc/kboot/Makefile	Fri Apr  3 02:27:40 2015	(r281009)
@@ -113,6 +113,7 @@ loader.help: help.common help.kboot ${.C
 	cat ${.ALLSRC} | \
 	    awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
 
+.PATH: ${.CURDIR}/../../forth
 .include	"${.CURDIR}/../../forth/Makefile.inc"
 
 .if !exists(${DESTDIR}/boot/loader.rc)

Modified: head/sys/boot/powerpc/ofw/Makefile
==============================================================================
--- head/sys/boot/powerpc/ofw/Makefile	Thu Apr  2 23:12:18 2015	(r281008)
+++ head/sys/boot/powerpc/ofw/Makefile	Fri Apr  3 02:27:40 2015	(r281009)
@@ -108,6 +108,7 @@ loader.help: help.common help.ofw ${.CUR
 	cat ${.ALLSRC} | \
 	    awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
 
+.PATH: ${.CURDIR}/../../forth
 .include	"${.CURDIR}/../../forth/Makefile.inc"
 
 .if !exists(${DESTDIR}/boot/loader.rc)

Modified: head/sys/boot/sparc64/loader/Makefile
==============================================================================
--- head/sys/boot/sparc64/loader/Makefile	Thu Apr  2 23:12:18 2015	(r281008)
+++ head/sys/boot/sparc64/loader/Makefile	Fri Apr  3 02:27:40 2015	(r281009)
@@ -95,6 +95,7 @@ loader.help: help.common help.sparc64
 	cat ${.ALLSRC} | \
 	    awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
 
+.PATH: ${.CURDIR}/../../forth
 .include	"${.CURDIR}/../../forth/Makefile.inc"
 
 .if !exists(${DESTDIR}/boot/loader.rc)



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