FreeBSD Bugzilla – Attachment 205980 Details for
Bug 237290
[PATCH] build(7): PORTS_MODULES does not build in parallel
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
more env vars to ports
kern.post.mk.patch (text/plain), 2.44 KB, created by
Ivan Rozhuk
on 2019-07-22 04:10:43 UTC
(
hide
)
Description:
more env vars to ports
Filename:
MIME Type:
Creator:
Ivan Rozhuk
Created:
2019-07-22 04:10:43 UTC
Size:
2.44 KB
patch
obsolete
>Index: /usr/src/sys/conf/kern.post.mk >=================================================================== >--- /usr/src/sys/conf/kern.post.mk (revision 350205) >+++ /usr/src/sys/conf/kern.post.mk (working copy) >@@ -73,8 +73,21 @@ > OSRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \ > ${MAKEOBJDIRPREFIX}${SRC_BASE}/include/osreldate.h > .endif >+ >+# Read ports defaults. >+PORTSDIR?= $(${MAKE} -V PORTSDIR) >+DISTDIR?= $(${MAKE} -V DISTDIR) >+PORT_DBDIR?= $(${MAKE} -V PORT_DBDIR) >+OPTIONS_SET?= $(${MAKE} -V OPTIONS_SET) >+OPTIONS_UNSET?= $(${MAKE} -V OPTIONS_UNSET) >+NO_CCACHE?= $(${MAKE} -V NO_CCACHE) >+CCACHE_DIR?= $(${MAKE} -V CCACHE_DIR) >+WITH_CCACHE_BUILD?= $(${MAKE} -V WITH_CCACHE_BUILD) >+DEFAULT_VERSIONS?= $(${MAKE} -V DEFAULT_VERSIONS) >+WITH_DEBUG_PORTS?= $(${MAKE} -V WITH_DEBUG_PORTS) > # Keep the related ports builds in the obj directory so that they are only rebuilt once per kernel build >-WRKDIRPREFIX?= ${.OBJDIR} >+WRKDIRPREFIX= ${.OBJDIR} >+MAKEFLAGS_PORTS=${MAKEFLAGS:M*:tW:S/^-m /-m_/g:S/ -m / -m_/g:S/^-j /-m_/g:S/ -j / -m_/g:S/^-J /-m_/g:S/ -J / -m_/g:tw:N-m_*:NMK_AUTO_OBJ=*} > PORTSMODULESENV=\ > env \ > -u CC \ >@@ -83,7 +96,18 @@ > -u MAKESYSPATH \ > -u MK_AUTO_OBJ \ > -u MAKEOBJDIR \ >- MAKEFLAGS="${MAKEFLAGS:M*:tW:S/^-m /-m_/g:S/ -m / -m_/g:tw:N-m_*:NMK_AUTO_OBJ=*}" \ >+ PORTSDIR="${PORTSDIR}" \ >+ DISTDIR="${DISTDIR}" \ >+ PORT_DBDIR="${PORT_DBDIR}" \ >+ OPTIONS_SET="${OPTIONS_SET}" \ >+ OPTIONS_UNSET="${OPTIONS_UNSET}" \ >+ NO_CCACHE="${NO_CCACHE}" \ >+ CCACHE_DIR="${CCACHE_DIR}" \ >+ WITH_CCACHE_BUILD="${WITH_CCACHE_BUILD}" \ >+ DEFAULT_VERSIONS="${DEFAULT_VERSIONS}" \ >+ WITH_DEBUG_PORTS="${WITH_DEBUG_PORTS}" \ >+ MAKEFLAGS="${MAKEFLAGS_PORTS}" \ >+ MAKE_JOBS_NUMBER=${.MAKE.JOBS} \ > SYSDIR=${SYSDIR} \ > PATH=${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin \ > SRC_BASE=${SRC_BASE} \ >@@ -95,7 +119,7 @@ > all: > .for __i in ${PORTS_MODULES} > @${ECHO} "===> Ports module ${__i} (all)" >- cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B clean build >+ ${PORTSMODULESENV} ${MAKE} -C "${PORTSDIR}/${__i}" clean build > .endfor > > .for __target in install reinstall clean >@@ -103,7 +127,8 @@ > ports-${__target}: > .for __i in ${PORTS_MODULES} > @${ECHO} "===> Ports module ${__i} (${__target})" >- cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B ${__target:C/(re)?install/deinstall reinstall/} >+ ${PORTSMODULESENV} ${MAKE} -C "${PORTSDIR}/${__i}" \ >+ ${__target:C/(re)?install/deinstall reinstall/} > .endfor > .endfor > .endif
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 237290
:
203705
|
203755
|
205980
|
234277
|
234307
|
247153
|
247166