Skip to content

Commit

Permalink
ports-mgmt/pkg-devel: Fix packaging from poudriere
Browse files Browse the repository at this point in the history
If there is no pkg(8) installed in the jail/host pkg-static will be used
but we don't have pkg-static with SAN so add a link in the WRKSRC.
Also poudriere just extract pkg-static from the pkg archive so cp
instead of symlink
  • Loading branch information
evadot committed Sep 14, 2021
1 parent 4225322 commit 72629b6
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions ports-mgmt/pkg-devel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,18 @@ post-patch:
${REINPLACE_CMD} -e "s|-llzma|${LIBLZMA_LIBS}|g" ${WRKSRC}/auto.def \
${WRKSRC}/src/Makefile.autosetup ${WRKSRC}/tests/Makefile.autosetup

.if ${PORT_OPTIONS:MSAN}
post-build:
@(cd ${WRKSRC}/src && \
${LN} -fs pkg pkg-static)
.endif

post-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/lib/compat/pkg
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}/NEWS
.if ${PORT_OPTIONS:MSAN}
@(cd ${STAGEDIR}${PREFIX}/sbin/ && \
${LN} -fs pkg pkg-static)
@${CP} ${STAGEDIR}${PREFIX}/sbin/pkg ${STAGEDIR}${PREFIX}/sbin/pkg-static
.endif

.include <bsd.port.post.mk>

0 comments on commit 72629b6

Please sign in to comment.