cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use pkg-static when cross building

Browse Source 
PR:		224217
Submitted by:	nwhitehorn
Approved by:	bapt
This commit is contained in:
Steve Wills 2018-02-06 14:13:35 +00:00
parent a60e477e4c
commit cbee9380e1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=461053
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports-mgmt/pkg-devel/Makefile
View File

@ -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

5
ports-mgmt/pkg/Makefile
View File

@ -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}