Attachment 147542 Details for Bug 193808 – patch to MFC rev 258705

[patch] patch to MFC rev 258705

d (text/plain), 1.28 KB, created by Thomas Quinot on 2014-09-21 21:25:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Quinot

Created: 2014-09-21 21:25:04 UTC

Size: 1.28 KB

patch

obsolete

>Index: nanobsd.sh
>===================================================================
>--- nanobsd.sh	(révision 271935)
>+++ nanobsd.sh	(copie de travail)
>@@ -57,7 +57,8 @@
> # default is ${NANO_OBJ}
> #NANO_DISKIMGDIR=""
> 
>-# Parallel Make
>+# Make & parallel Make
>+NANO_MAKE="make"
> NANO_PMAKE="make -j 3"
> 
> # The default name for any image we create.
>@@ -254,7 +255,7 @@
> 
> 	cd ${NANO_SRC}
> 	env TARGET_ARCH=${NANO_ARCH} \
>-	${NANO_PMAKE} __MAKE_CONF=${NANO_MAKE_CONF_INSTALL} installworld \
>+	${NANO_MAKE} __MAKE_CONF=${NANO_MAKE_CONF_INSTALL} installworld \
> 		DESTDIR=${NANO_WORLDDIR} \
> 		> ${NANO_OBJ}/_.iw 2>&1
> 	chflags -R noschg ${NANO_WORLDDIR}
>@@ -267,7 +268,7 @@
> 
> 	cd ${NANO_SRC}
> 	env TARGET_ARCH=${NANO_ARCH} \
>-	${NANO_PMAKE} __MAKE_CONF=${NANO_MAKE_CONF_INSTALL} distribution \
>+	${NANO_MAKE} __MAKE_CONF=${NANO_MAKE_CONF_INSTALL} distribution \
> 		DESTDIR=${NANO_WORLDDIR} \
> 		> ${NANO_OBJ}/_.etc 2>&1
> 	# make.conf doesn't get created by default, but some ports need it
>@@ -886,6 +887,7 @@
> if $do_clean ; then
> 	true
> else
>+	NANO_MAKE="${NANO_MAKE} -DNO_CLEAN"
> 	NANO_PMAKE="${NANO_PMAKE} -DNO_CLEAN"
> fi
> 
>@@ -905,6 +907,7 @@
> export NANO_HEADS
> export NANO_IMAGES
> export NANO_IMGNAME
>+export NANO_MAKE
> export NANO_MAKE_CONF_BUILD
> export NANO_MAKE_CONF_INSTALL
> export NANO_MEDIASIZE

Actions: View | Diff

Attachments on bug 193808: 147523 | 147542