diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2014-09-23 05:23:52 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2014-09-23 05:23:52 +0800 |
| commit | 76d8ada5d536916f38851ff87ca873dd455f686c (patch) | |
| tree | 62a5571b3f2e74b64aa1af4fbad84c818f0814e7 /ports-mgmt/pkg-devel | |
| parent | d67e0d38ce45677dff0e998ca842635c8a9a9aea (diff) | |
| download | freebsd-ports-gnome-76d8ada5d536916f38851ff87ca873dd455f686c.tar.gz freebsd-ports-gnome-76d8ada5d536916f38851ff87ca873dd455f686c.tar.zst freebsd-ports-gnome-76d8ada5d536916f38851ff87ca873dd455f686c.zip | |
If not built with WITH_PKG=devel, depend on ports-mgmt/pkg. This will use
the normal pkg for packaging pkg-devel. This is needed because the repo is
expected to be only non-devel packages.
This also fixes a poudriere crash when the repo is empty and both pkg and
pkg-devel are built. When pkg-devel would finish first it would crash due to
not having a pkg to use for caching various metadata from the package.
Differential Revision: D809
With hat: portmgr
Reviewed by: bapt
Diffstat (limited to 'ports-mgmt/pkg-devel')
| -rw-r--r-- | ports-mgmt/pkg-devel/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile index 78b97c85f601..20cec6eb4bbf 100644 --- a/ports-mgmt/pkg-devel/Makefile +++ b/ports-mgmt/pkg-devel/Makefile @@ -46,6 +46,8 @@ IGNORE= WITH_PKG is not defined to 'devel', this version is the devel one .else LATEST_LINK= pkg PKGNAMESUFFIX= +#define PKG_DEPENDS to nothing to avoid infinite loop looking for pkg :) +PKG_DEPENDS= .endif .if exists(${LOCALBASE}/sbin/pkg_info) || exists(/usr/sbin/pkg_info) NB_OLDPKGS!= pkg_info 2>/dev/null | wc -l @@ -74,8 +76,6 @@ pre-everything:: LATEST_LINK= pkg-devel .endif -#define PKG_DEPENDS to nothing to avoid infinite loop looking for pkg :) -PKG_DEPENDS= .undef INSTALLS_DEPENDS .if !exists(${LOCALBASE}/sbin/pkg) PKG_BIN= ${WRKSRC}/src/pkg-static |