Date: Mon, 22 Sep 2014 21:23:52 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r368999 - head/ports-mgmt/pkg-devel Message-ID: <201409222123.s8MLNq25030285@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Mon Sep 22 21:23:52 2014 New Revision: 368999 URL: http://svnweb.freebsd.org/changeset/ports/368999 QAT: https://qat.redports.org/buildarchive/r368999/ Log: 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 Modified: head/ports-mgmt/pkg-devel/Makefile Modified: head/ports-mgmt/pkg-devel/Makefile ============================================================================== --- head/ports-mgmt/pkg-devel/Makefile Mon Sep 22 21:08:59 2014 (r368998) +++ head/ports-mgmt/pkg-devel/Makefile Mon Sep 22 21:23:52 2014 (r368999) @@ -46,6 +46,8 @@ IGNORE= WITH_PKG is not defined to 'deve .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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409222123.s8MLNq25030285>