diff options
| author | richard <richard> | 2014-02-21 18:18:49 +0000 |
|---|---|---|
| committer | richard <richard> | 2014-02-21 18:18:49 +0000 |
| commit | e40ba5b03d9a01d726d603f0d86aac38504b5d8f (patch) | |
| tree | f16cc206c01be6f00c9f190bda94859c165f836c /pkgtools | |
| parent | 6ddc44c37bcf1475d186384c602e784f607880c3 (diff) | |
| download | pkgsrc-e40ba5b03d9a01d726d603f0d86aac38504b5d8f.tar.gz | |
Add special case for dependency checking in 'non-bootstrap' builds,
don't redefine 'pkg_info' if it already exists.
This is notably for pkg_rolling_replace -u in case pkg_install
was revbump'd and openssl happens to be in PKG_DEFAULT_OPTIONS.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_install/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile index dac2b109f82..963ac3b7fab 100644 --- a/pkgtools/pkg_install/Makefile +++ b/pkgtools/pkg_install/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.200 2014/02/12 23:18:28 tron Exp $ +# $NetBSD: Makefile,v 1.201 2014/02/21 18:18:49 richard Exp $ # Notes to package maintainers: # @@ -59,7 +59,13 @@ USE_NATIVE_GCC= yes PKG_ADD_CMD= ${WRKSRC}/add/pkg_add PKG_CREATE_CMD= ${WRKSRC}/create/pkg_create PKG_DELETE_CMD= ${WRKSRC}/delete/pkg_delete +# +# Special case for dependency checking in 'non-bootstrap' builds: +# don't redefine 'pkg_info' if it already exists. +# +. if defined(PKG_INFO_CMD) && !exists(${PKG_INFO_CMD}) PKG_INFO_CMD= ${WRKSRC}/info/pkg_info +. endif .endif CPPFLAGS+= -D_LARGEFILE_SOURCE -D_LARGE_FILES |