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

"fake" extra @depend lines for LIB_DEPENDS in port-lib-depends-check, so

Browse Source 
that they show up even if there's no WANTLIB for them yet
This commit is contained in:
espie 2010-11-11 12:38:51 +00:00
parent 89d5cdea52
commit e7a2eb26ed
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
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.1055 2010/11/09 23:55:28 espie Exp $
# $OpenBSD: bsd.port.mk,v 1.1056 2010/11/11 12:38:51 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 $
#
@ -1979,7 +1979,7 @@ ${WRKINST}/.saved_libs: ${_FAKE_COOKIE}
port-lib-depends-check: ${WRKINST}/.saved_libs
. for _S in ${MULTI_PACKAGES}
-@SUBPACKAGE=${_S} ${MAKE} print-plist-with-depends | \
-@SUBPACKAGE=${_S} ${MAKE} _print-plist-with-extra-depends | \
${_CHECK_LIB_DEPENDS} -s ${WRKINST}/.saved_libs
. endfor
@ -2559,6 +2559,29 @@ print-plist-with-depends:
fi ; \
${_plist_footer}
# XXX this helps for port-lib-depends-check
# create "extra" depends lines that correspond to LIB_DEPENDS that would
# be stripped because there is no lib depending on them in WANTLIB
_print-plist-with-extra-depends:
.if ${NO_SHARED_LIBS:L} != "yes"
. for _i in ${LIB_DEPENDS${SUBPACKAGE}}
@echo '${_i}'|{ \
IFS=:; read dep pkg subdir target; \
${_flavor_fragment}; \
if default=`eval $$toset ${MAKE} _print-packagename`; then \
case "X$$pkg" in X) pkg=`echo "$$default" |${_version2default}`;; \
esac; \
echo "@depend $$subdir:$$pkg:$$default"; \
else \
echo 1>&2 "Problem with dependency ${_i}"; \
exit 1; \
fi; \
}
. endfor
.endif
@${_MAKE} print-plist-with-depends
print-plist-all:
.for _S in ${MULTI_PACKAGES}
@${ECHO_MSG} "===> ${FULLPKGNAME${_S}}"
@ -3373,7 +3396,7 @@ _all_phony = ${_recursive_depends_targets} \
print-build-depends print-run-depends readme readmes rebuild \
regress-depends repackage run-depends run-depends-list show-required-by \
subpackage uninstall mirror-maker-fetch \
lock unlock
lock unlock _print-plist-with-extra-depends
.if defined(_DEBUG_TARGETS)
. for _t in ${_all_phony}