Date: Tue, 6 Feb 2018 14:13:35 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r461053 - in head/ports-mgmt: pkg pkg-devel Message-ID: <201802061413.w16EDZxd094703@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Tue Feb 6 14:13:35 2018 New Revision: 461053 URL: https://svnweb.freebsd.org/changeset/ports/461053 Log: Don't use pkg-static when cross building PR: 224217 Submitted by: nwhitehorn Approved by: bapt Modified: head/ports-mgmt/pkg-devel/Makefile (contents, props changed) head/ports-mgmt/pkg/Makefile (contents, props changed) Modified: head/ports-mgmt/pkg-devel/Makefile ============================================================================== --- head/ports-mgmt/pkg-devel/Makefile Tue Feb 6 14:09:14 2018 (r461052) +++ head/ports-mgmt/pkg-devel/Makefile Tue Feb 6 14:13:35 2018 (r461053) @@ -70,7 +70,7 @@ pre-everything:: .endif .undef INSTALLS_DEPENDS -.if !exists(${LOCALBASE}/sbin/pkg) +.if !exists(${LOCALBASE}/sbin/pkg) || !defined(CROSS_TOOLCHAIN) PKG_BIN= ${WRKSRC}/src/pkg-static .endif Modified: head/ports-mgmt/pkg/Makefile ============================================================================== --- head/ports-mgmt/pkg/Makefile Tue Feb 6 14:09:14 2018 (r461052) +++ head/ports-mgmt/pkg/Makefile Tue Feb 6 14:13:35 2018 (r461053) @@ -70,7 +70,12 @@ pre-everything:: #define PKG_DEPENDS to nothing to avoid infinite loop looking for pkg :) PKG_DEPENDS= .undef INSTALLS_DEPENDS + +# Use the internal pkg instead, generally, unless this is a cross-build, +# in which case that won't work. Hope for the best then. +.if !defined(CROSS_TOOLCHAIN) PKG_BIN= ${WRKSRC}/src/pkg-static +.endif post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802061413.w16EDZxd094703>