cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

protect patch targets with systrace as well

Browse Source 
no objection from espie, looks good steven
This commit is contained in:
sturm 2006-06-18 10:10:04 +00:00
parent 7ef6a9d023
commit a1fe8792f9
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
infrastructure/mk/bsd.port.mk
View File

@ -1,6 +1,6 @@
#-*- mode: Makefile; tab-width: 4; -*- #-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make: # ex:ts=4 sw=4 filetype=make:
# $OpenBSD: bsd.port.mk,v 1.748 2006/06/16 18:48:58 sturm Exp $ # $OpenBSD: bsd.port.mk,v 1.749 2006/06/18 10:10:04 sturm Exp $
# $FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $ # $FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
# $NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $ # $NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
# #
@ -633,7 +633,7 @@ _SYSTRACE_CMD=
.endif .endif
SYSTRACE_FILTER?= ${PORTSDIR}/infrastructure/db/systrace.filter SYSTRACE_FILTER?= ${PORTSDIR}/infrastructure/db/systrace.filter
_SYSTRACE_POLICIES+= /bin/sh /usr/bin/env /usr/bin/make \ _SYSTRACE_POLICIES+= /bin/sh /usr/bin/env /usr/bin/make \
${DEPBASE}/bin/gmake /usr/bin/patch ${DEPBASE}/bin/gmake
SYSTRACE_SUBST_VARS+= DISTDIR PKG_TMPDIR PORTSDIR TMPDIR WRKDIR SYSTRACE_SUBST_VARS+= DISTDIR PKG_TMPDIR PORTSDIR TMPDIR WRKDIR
.for _v in ${SYSTRACE_SUBST_VARS} .for _v in ${SYSTRACE_SUBST_VARS}
_SYSTRACE_SED_SUBST+=-e 's,$${${_v}},${${_v}},g' _SYSTRACE_SED_SUBST+=-e 's,$${${_v}},${${_v}},g'
@ -1786,7 +1786,7 @@ do-extract:
# Hence it needs special treatment (a specific cookie). # Hence it needs special treatment (a specific cookie).
.if target(pre-patch) .if target(pre-patch)
${_PREPATCH_COOKIE}: ${_PREPATCH_COOKIE}:
@cd ${.CURDIR} && exec ${MAKE} pre-patch @cd ${.CURDIR} && exec ${_SYSTRACE_CMD} ${MAKE} pre-patch
. if ${PATCH_CHECK_ONLY:L} != "yes" . if ${PATCH_CHECK_ONLY:L} != "yes"
@${_MAKE_COOKIE} $@ @${_MAKE_COOKIE} $@
. endif . endif
@ -1800,9 +1800,16 @@ ${_DISTPATCH_COOKIE}: ${_EXTRACT_COOKIE}
.if target(pre-patch) .if target(pre-patch)
@cd ${.CURDIR} && exec ${MAKE} ${_PREPATCH_COOKIE} @cd ${.CURDIR} && exec ${MAKE} ${_PREPATCH_COOKIE}
.endif .endif
.if target(do-distpatch) @cd ${.CURDIR} && exec ${_SYSTRACE_CMD} ${MAKE} do-distpatch
@cd ${.CURDIR} && exec ${MAKE} do-distpatch .if target(post-distpatch)
.else @cd ${.CURDIR} && exec ${_SYSTRACE_CMD} ${MAKE} post-distpatch
.endif
.if ${PATCH_CHECK_ONLY:L} != "yes"
@${_MAKE_COOKIE} $@
.endif
.if !target(do-distpatch)
do-distpatch:
# What DISTPATCH normally does # What DISTPATCH normally does
. if defined(_PATCHFILES) . if defined(_PATCHFILES)
@${ECHO_MSG} "===> Applying distribution patches for ${FULLPKGNAME}${_MASTER}" @${ECHO_MSG} "===> Applying distribution patches for ${FULLPKGNAME}${_MASTER}"
@ -1819,12 +1826,6 @@ ${_DISTPATCH_COOKIE}: ${_EXTRACT_COOKIE}
. endif . endif
# End of DISTPATCH. # End of DISTPATCH.
.endif .endif
.if target(post-distpatch)
@cd ${.CURDIR} && exec ${MAKE} post-distpatch
.endif
.if ${PATCH_CHECK_ONLY:L} != "yes"
@${_MAKE_COOKIE} $@
.endif
# The real patch # The real patch
@ -1834,7 +1835,7 @@ ${_PATCH_COOKIE}: ${_EXTRACT_COOKIE}
@cd ${.CURDIR} && exec ${MAKE} ${_PREPATCH_COOKIE} @cd ${.CURDIR} && exec ${MAKE} ${_PREPATCH_COOKIE}
.endif .endif
.if target(do-patch) .if target(do-patch)
@cd ${.CURDIR} && exec ${MAKE} do-patch @cd ${.CURDIR} && exec ${_SYSTRACE_CMD} ${MAKE} do-patch
.else .else
# What PATCH normally does: # What PATCH normally does:
# XXX test for efficiency, don't bother with distpatch if it's not needed # XXX test for efficiency, don't bother with distpatch if it's not needed
@ -1854,7 +1855,7 @@ ${_PATCH_COOKIE}: ${_EXTRACT_COOKIE}
no) ;; \ no) ;; \
*) ${ECHO_MSG} "===> Applying ${OPSYS} patch $$i" ;; \ *) ${ECHO_MSG} "===> Applying ${OPSYS} patch $$i" ;; \
esac; \ esac; \
${PATCH} ${PATCH_ARGS} < $$i || \ ${_SYSTRACE_CMD} ${PATCH} ${PATCH_ARGS} < $$i || \
{ echo "***> $$i did not apply cleanly"; \ { echo "***> $$i did not apply cleanly"; \
error=true; }\ error=true; }\
else \ else \
@ -1871,7 +1872,7 @@ ${_PATCH_COOKIE}: ${_EXTRACT_COOKIE}
# End of PATCH. # End of PATCH.
.endif .endif
.if target(post-patch) .if target(post-patch)
@cd ${.CURDIR} && exec ${MAKE} post-patch @cd ${.CURDIR} && exec ${_SYSTRACE_CMD} ${MAKE} post-patch
.endif .endif
.for _m in ${MODULES} .for _m in ${MODULES}
. if defined(MOD${_m:U}_post-patch) . if defined(MOD${_m:U}_post-patch)