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

Restore previous behaviour wrt PKG_CREATE_NO_CHECKS. Keep it to 'no' by

Browse Source 
default (for production/bulks), setting it to 'yes' disables the check
as it was before (for slow archs), and setting it to 'warn' will now
show the differences between wantlib lists, but as a warning and not an
error (which was the behaviour introduced in previous commit for 'yes'
case)
ok espie@
This commit is contained in:
landry 2013-07-08 18:27:30 +00:00
parent 5c6a06e862
commit 19b9184761
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
# $OpenBSD: bsd.port.mk,v 1.1241 2013/07/08 12:45:56 espie Exp $
# $OpenBSD: bsd.port.mk,v 1.1242 2013/07/08 18:27:30 landry Exp $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
# This file is in the public domain.
@ -1375,10 +1375,14 @@ _resolve_lib += -noshared
PKG_CREATE_NO_CHECKS ?= No
.if ${PKG_CREATE_NO_CHECKS:L} == "yes"
_pkg_wantlib_args = fake-wantlib-args
.elif ${PKG_CREATE_CHECKS:L} == "warn"
_pkg_wantlib_args = wantlib-args
_check_msg = Warning
# ignore diff error
_check_error = || true
.else
_pkg_wantlib_args = wantlib-args
_check_msg = Error
# let diff error out
_check_error =
@ -1855,7 +1859,7 @@ ${_PACKAGE_COOKIE${_S}}:
@${ECHO_MSG} "Create ${_PACKAGE_COOKIE${_S}}"
@cd ${.CURDIR} && \
tmp=${_TMP_REPO}${_PKGFILE${_S}} pkgname=${_PKGFILE${_S}} permit_ftp=${PERMIT_PACKAGE_FTP${_S}:L:Q} permit_cdrom=${PERMIT_PACKAGE_CDROM${_S}:L:Q} && \
if deps=`SUBPACKAGE=${_S} wantlib_args=wantlib-args \
if deps=`SUBPACKAGE=${_S} wantlib_args=${_pkg_wantlib_args} \
${MAKE} print-package-args` && \
${SUDO} ${_PKG_CREATE} -DPORTSDIR="${PORTSDIR}" \
$$deps ${PKG_ARGS${_S}} $$tmp && \