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

special case: if PKGPATH is the LIB_DEPENDS base, then it means we're

Browse Source 
building a subpackage, and then we definitely want the `current' stuff,
not the stuff that's already installed.

Allows shared libs updates in MULTI_PACKAGES to proceed gracefully without
having to uninstall stuff.

(we do not do this stuff in general, because in other cases, builds are
`staggered', e.g., a port is built against the existing base, not the stuff
in other WRKDIRS)
This commit is contained in:
espie 2006-10-18 11:09:30 +00:00
parent 3c9d9e9fcb
commit d1257184f9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
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.783 2006/10/18 10:51:39 espie Exp $
# $OpenBSD: bsd.port.mk,v 1.784 2006/10/18 11:09:30 espie 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 $
#
@ -2485,6 +2485,9 @@ _print-package-args:
case "X$$pkg" in X) pkg=`echo $$default|${_version2default}`;; esac; \
if pkg_info -q -e $$pkg; then \
listlibs='echo ${DEPDIR}$$shdir/lib*'; \
case $$dir in ${PKGPATH}) \
listlibs="$$toset ${MAKE} print-plist-contents|${_grab_libs_from_plist}; $$listlibs";; \
esac; \
else \
listlibs="$$toset ${MAKE} print-plist-contents|${_grab_libs_from_plist}"; \
fi; \