Check-in [d6cf525111]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:MFT: If host is recent current and building stable/9 or stable/8 then use fmake to build
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | 3.0.x
Files: files | file ages | folders
SHA1: d6cf52511169216cff2d20f1bc93f881fa47977a
User & Date: bdrewery 2013-06-25 20:57:20
Context
2013-06-25
20:57
MFT: If host is recent current and building stable/9 or stable/8 then use fmake to build Leaf check-in: d6cf525111 user: bdrewery tags: 3.0.x
2013-06-23
12:04
MFT: jail/ports -u: Always try upgrading the SVN checkout before updating check-in: 97b3f76e8f user: bdrewery tags: 3.0.x
Changes

Changes to src/share/poudriere/jail.sh.

185
186
187
188
189
190
191







192
193
194
195
196
197
198
199
200
201
202
203
204
	if [ -n "${CCACHE_DIR}" -a -d ${CCACHE_PATH}/world ]; then
		export CCACHE_DIR
		export CC="${CCACHE_PATH}/world/cc"
		export CXX="${CCACHE_PATH}/world/c++"
		unset CCACHE_TEMPDIR
	fi








	msg "Starting make buildworld with ${PARALLEL_JOBS} jobs"
	make -C ${JAILMNT}/usr/src buildworld ${MAKE_JOBS} ${MAKEWORLDARGS} || err 1 "Fail to build world"
	msg "Starting make installworld"
	make -C ${JAILMNT}/usr/src installworld DESTDIR=${JAILMNT} DB_FROM_SRC=1 || err 1 "Fail to install world"
	make -C ${JAILMNT}/usr/src DESTDIR=${JAILMNT} distrib-dirs &&
	make -C ${JAILMNT}/usr/src DESTDIR=${JAILMNT} distribution
}

install_from_svn() {
	local UPDATE=0
	local proto
	[ -d ${JAILMNT}/usr/src ] && UPDATE=1
	mkdir -p ${JAILMNT}/usr/src







>
>
>
>
>
>
>

|

|
|
|







185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
	if [ -n "${CCACHE_DIR}" -a -d ${CCACHE_PATH}/world ]; then
		export CCACHE_DIR
		export CC="${CCACHE_PATH}/world/cc"
		export CXX="${CCACHE_PATH}/world/c++"
		unset CCACHE_TEMPDIR
	fi

	fbsdver=$(awk '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' ${JAILMNT}/usr/src/sys/sys/param.h)
	hostver=$(sysctl -n kern.osreldate)
	make_cmd=make
	if [ ${hostver} -gt 1000000 -a ${fbsdver} -lt 1000000 ]; then
		[ -x `which fmake 2>/dev/null` ] || err 1 "You need fmake installed on the host: devel/fmake"
		make_cmd=fmake
	fi
	msg "Starting make buildworld with ${PARALLEL_JOBS} jobs"
	${make_cmd} -C ${JAILMNT}/usr/src buildworld ${MAKE_JOBS} ${MAKEWORLDARGS} || err 1 "Fail to build world"
	msg "Starting make installworld"
	${make_cmd} -C ${JAILMNT}/usr/src installworld DESTDIR=${JAILMNT} DB_FROM_SRC=1 || err 1 "Fail to install world"
	${make_cmd} -C ${JAILMNT}/usr/src DESTDIR=${JAILMNT} distrib-dirs &&
	${make_cmd} -C ${JAILMNT}/usr/src DESTDIR=${JAILMNT} distribution
}

install_from_svn() {
	local UPDATE=0
	local proto
	[ -d ${JAILMNT}/usr/src ] && UPDATE=1
	mkdir -p ${JAILMNT}/usr/src