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

expose print-package-args and friends

Browse Source 
create an all-lib-depends-args target that's ways less hackish
than _print-plist-with-extra-depends
for port-lib-depends-check
This commit is contained in:
espie 2011-06-26 14:40:21 +00:00
parent d8f587b5a8
commit 38ada0432c
1 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
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.1090 2011/06/24 14:44:05 espie Exp $
# $OpenBSD: bsd.port.mk,v 1.1091 2011/06/26 14:40:21 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 $
#
@ -1381,6 +1381,7 @@ _pkg_wantlib_args = fake-wantlib-args
_pkg_wantlib_args = wantlib-args
.endif
wantlib_args ?= port-wantlib-args
lib_depends_args ?= lib-depends-args
# fairly good approximation of libraries we want
@ -1705,8 +1706,8 @@ ${_PACKAGE_COOKIE${_S}}:
@${ECHO_MSG} "Create ${_PACKAGE_COOKIE${_S}}"
@cd ${.CURDIR} && \
tmp=${_TMP_REPO}${_PKGFILE${_S}} && \
if deps=`SUBPACKAGE=${_S} _wantlib_args=_wantlib-args \
${MAKE} _print-package-args` && \
if deps=`SUBPACKAGE=${_S} wantlib_args=${_pkg_wantlib_args} \
${MAKE} print-package-args` && \
${SUDO} ${_PKG_CREATE} -DPORTSDIR="${PORTSDIR}" \
$$deps ${PKG_ARGS${_S}} $$tmp && \
${_check_lib_depends} $$tmp && \
@ -2048,7 +2049,7 @@ ${WRKINST}/.saved_libs: ${_FAKE_COOKIE}
port-lib-depends-check: ${WRKINST}/.saved_libs
. for _S in ${MULTI_PACKAGES}
@-SUBPACKAGE=${_S} ${MAKE} _print-plist-with-extra-depends | \
@-SUBPACKAGE=${_S} ${MAKE} print-plist-with-depends lib_depends_args=all-lib-depends-args| \
${_CHECK_LIB_DEPENDS} -s ${WRKINST}/.saved_libs
. endfor
@ -2627,7 +2628,7 @@ print-plist:
print-plist-with-depends:
@${_plist_header}; \
if a=`SUBPACKAGE=${SUBPACKAGE} ${MAKE} _print-package-args`; \
if a=`SUBPACKAGE=${SUBPACKAGE} ${MAKE} print-package-args`; \
then \
${_PKG_CREATE} -n -q $$a ${PKG_ARGS${SUBPACKAGE}} ${_PACKAGE_COOKIE${SUBPACKAGE}}; \
else \
@ -2635,22 +2636,6 @@ 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}'|{ \
${_parse_spec}; \
${_complete_pkgspec}; \
echo "@depend $$subdir:$$pkg:$$default"; \
}
. endfor
.endif
@${_MAKE} print-plist-with-depends
print-plist-all:
.for _S in ${MULTI_PACKAGES}
@${ECHO_MSG} "===> ${FULLPKGNAME${_S}}"
@ -2661,7 +2646,7 @@ print-plist-all-with-depends:
.for _S in ${MULTI_PACKAGES}
@${ECHO_MSG} "===> ${FULLPKGNAME${_S}}"
@${_plist_header}; \
if a=`SUBPACKAGE=${_S} ${MAKE} _print-package-args`; \
if a=`SUBPACKAGE=${_S} ${MAKE} print-package-args`; \
then \
${_PKG_CREATE} -n -q $$a ${PKG_ARGS${_S}} ${_PACKAGE_COOKIE${_S}}; \
else \
@ -3066,13 +3051,13 @@ print-package-signature:
@echo
_print-package-args: _run-depends-args
print-package-args: run-depends-args
.if ${NO_SHARED_LIBS:L} != "yes"
_print-package-args: _lib-depends-args ${wantlib_args}
print-package-args: ${lib_depends_args} ${wantlib_args}
.endif
_run-depends-args:
run-depends-args:
.for _i in ${RUN_DEPENDS${SUBPACKAGE}}
@echo '${_i}' |{ \
${_parse_spec}; \
@ -3081,11 +3066,23 @@ _run-depends-args:
}
.endfor
# waive checks for WANTLIB when we're running lib-depends-check
# since we're trying to figure out what's actually needed
all-lib-depends-args:
.for _i in ${LIB_DEPENDS${SUBPACKAGE}}
@echo '${_i}' |{ \
${_parse_spec}; \
${_complete_pkgspec}; \
echo "-P $$subdir:$$pkg:$$default"; \
}
.endfor
# those are expensive computations, so don't do them if we don't have to
.if empty(_DEPRUNLIBS)
_lib-depends-args wantlib-args port-wantlib-args fake-wantlib-args:
lib-depends-args wantlib-args port-wantlib-args fake-wantlib-args:
.else
_lib-depends-args:
lib-depends-args:
. for _i in ${LIB_DEPENDS${SUBPACKAGE}}
@echo '${_i}'|{ \
${_parse_spec}; \
@ -3112,8 +3109,8 @@ _lib-depends-args:
wantlib-args:
@a=`mktemp /tmp/portstree.XXXXXX`; b=`mktemp /tmp/inst.XXXXXX`; \
cd ${.CURDIR} && \
${MAKE} _port-wantlib-args >$$a && \
${MAKE} _fake-wantlib-args >$$b; \
${MAKE} port-wantlib-args >$$a && \
${MAKE} fake-wantlib-args >$$b; \
if cmp -s $$a $$b; \
then \
cat $$a; \
@ -3469,7 +3466,7 @@ _all_phony = ${_recursive_depends_targets} \
_internal-runwantlib-depends _internal-subpackage _internal-subupdate \
_internal-update _internal-update _internal-update-plist \
_internal_install _internal_runlib-depends _license-check \
_list-port-libs _print-package-args _print-package-signature-lib \
_list-port-libs print-package-args _print-package-signature-lib \
_print-package-signature-run _print-packagename _recurse-all-dir-depends \
_recurse-regress-dir-depends _recurse-run-dir-depends _refetch addsum \
build-depends build-depends-list checkpatch clean clean-depends \
@ -3483,8 +3480,8 @@ _all_phony = ${_recursive_depends_targets} \
print-build-depends print-run-depends readme readmes rebuild \
regress-depends run-depends run-depends-list show-required-by \
subpackage uninstall mirror-maker-fetch _print-pkgspec \
lock unlock _print-plist-with-extra-depends \
_run-depends-args _lib-depends-args wantlib-args \
lock unlock \
run-depends-args lib-depends-args all-lib-depends-args wantlib-args \
port-wantlib-args fake-wantlib-args no-wantlib-args
.if defined(_DEBUG_TARGETS)