FreeBSD Bugzilla – Attachment 133592 Details for
Bug 178072
[PATCH] [bsd.port.mk] look for Makefile.local in ${PORTSDIR} as well as ${.CURDIR}
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 2.84 KB, created by
Enji Cooper
on 2013-04-23 06:40:00 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Enji Cooper
Created:
2013-04-23 06:40:00 UTC
Size:
2.84 KB
patch
obsolete
>Index: Mk/bsd.port.mk >=================================================================== >--- Mk/bsd.port.mk (revision 316288) >+++ Mk/bsd.port.mk (working copy) >@@ -1260,10 +1260,12 @@ > USE_SUBMAKE= yes > .endif > >-.if exists(${MASTERDIR}/Makefile.local) >-.include "${MASTERDIR}/Makefile.local" >+.for d in ${PORTSDIR} ${MASTERDIR} >+.if exists($d/Makefile.local) >+.include "$d/Makefile.local" > USE_SUBMAKE= yes > .endif >+.endfor > > # where 'make config' records user configuration options > PORT_DBDIR?= /var/db/ports >Index: Mk/bsd.port.subdir.mk >=================================================================== >--- Mk/bsd.port.subdir.mk (revision 316288) >+++ Mk/bsd.port.subdir.mk (working copy) >@@ -107,33 +107,33 @@ > .endif > > .if !defined(PYTHON_DEFAULT_VERSION) >-PYTHON_DEFAULT_VERSION!= make -V PYTHON_DEFAULT_VERSION USE_PYTHON=1 -f ${PORTSDIR}/Mk/bsd.port.mk >+PYTHON_DEFAULT_VERSION!= ${MAKE} -V PYTHON_DEFAULT_VERSION USE_PYTHON=1 -f ${PORTSDIR}/Mk/bsd.port.mk > .endif > > .if !defined(PYTHON_DEFAULT_PORTVERSION) > # We are caching the PYTHON_PORTVERSION of the default python version so we can reuse it in the > # common case. >-PYTHON_DEFAULT_PORTVERSION!= make -V PYTHON_PORTVERSION USE_PYTHON=1 -f ${PORTSDIR}/Mk/bsd.port.mk >+PYTHON_DEFAULT_PORTVERSION!= ${MAKE} -V PYTHON_PORTVERSION USE_PYTHON=1 -f ${PORTSDIR}/Mk/bsd.port.mk > .endif > > .if !defined(PYTHONBASE) >-PYTHONBASE!= make -V PYTHONBASE USE_PYTHON=1 -f ${PORTSDIR}/Mk/bsd.port.mk >+PYTHONBASE!= ${MAKE} -V PYTHONBASE USE_PYTHON=1 -f ${PORTSDIR}/Mk/bsd.port.mk > .endif > > .if !defined(_JAVA_VERSION_LIST_REGEXP) >-_JAVA_VERSION_LIST_REGEXP!= make -V _JAVA_VERSION_LIST_REGEXP USE_JAVA=1 -f ${PORTSDIR}/Mk/bsd.port.mk >+_JAVA_VERSION_LIST_REGEXP!= ${MAKE} -V _JAVA_VERSION_LIST_REGEXP USE_JAVA=1 -f ${PORTSDIR}/Mk/bsd.port.mk > .endif > > .if !defined(_JAVA_VENDOR_LIST_REGEXP) >-_JAVA_VENDOR_LIST_REGEXP!= make -V _JAVA_VENDOR_LIST_REGEXP USE_JAVA=1 -f ${PORTSDIR}/Mk/bsd.port.mk >+_JAVA_VENDOR_LIST_REGEXP!= ${MAKE} -V _JAVA_VENDOR_LIST_REGEXP USE_JAVA=1 -f ${PORTSDIR}/Mk/bsd.port.mk > .endif > > .if !defined(_JAVA_OS_LIST_REGEXP) >-_JAVA_OS_LIST_REGEXP!= make -V _JAVA_OS_LIST_REGEXP USE_JAVA=1 -f ${PORTSDIR}/Mk/bsd.port.mk >+_JAVA_OS_LIST_REGEXP!= ${MAKE} -V _JAVA_OS_LIST_REGEXP USE_JAVA=1 -f ${PORTSDIR}/Mk/bsd.port.mk > .endif > > .if !defined(_JAVA_PORTS_INSTALLED) >-_JAVA_PORTS_INSTALLED!= make -V _JAVA_PORTS_INSTALLED USE_JAVA=1 -f ${PORTSDIR}/Mk/bsd.port.mk >+_JAVA_PORTS_INSTALLED!= ${MAKE} -V _JAVA_PORTS_INSTALLED USE_JAVA=1 -f ${PORTSDIR}/Mk/bsd.port.mk > .endif > > .if !defined(UID) >@@ -155,9 +155,11 @@ > INDEXFILE?= INDEX-${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} > > # local customization of the ports tree >-.if exists(${.CURDIR}/Makefile.local) >-.include "${.CURDIR}/Makefile.local" >+.for d in ${PORTSDIR} ${.CURDIR} >+.if exists($d/Makefile.local) >+.include "$d/Makefile.local" > .endif >+.endfor > > TARGETS+= all > TARGETS+= build
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 178072
: 133592 |
133593