From owner-svn-ports-all@freebsd.org Tue Feb 6 14:13:36 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3EABEED955A; Tue, 6 Feb 2018 14:13:36 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E64356B321; Tue, 6 Feb 2018 14:13:35 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E125E18F3C; Tue, 6 Feb 2018 14:13:35 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w16EDZdt094705; Tue, 6 Feb 2018 14:13:35 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w16EDZxd094703; Tue, 6 Feb 2018 14:13:35 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201802061413.w16EDZxd094703@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Tue, 6 Feb 2018 14:13:35 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/ports-mgmt: pkg pkg-devel X-SVN-Commit-Revision: 461053 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Feb 2018 14:13:36 -0000 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}