From 19b91847614b65fb4f47e697ff8066efbfe8a770 Mon Sep 17 00:00:00 2001 From: landry Date: Mon, 8 Jul 2013 18:27:30 +0000 Subject: [PATCH] Restore previous behaviour wrt PKG_CREATE_NO_CHECKS. Keep it to 'no' by 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@ --- infrastructure/mk/bsd.port.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/infrastructure/mk/bsd.port.mk b/infrastructure/mk/bsd.port.mk index a22e8c93035..bd84985c1c6 100644 --- a/infrastructure/mk/bsd.port.mk +++ b/infrastructure/mk/bsd.port.mk @@ -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 && \