Date: Tue, 14 Sep 2021 11:52:19 GMT From: Emmanuel Vadot <manu@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 72629b6891c8 - main - ports-mgmt/pkg-devel: Fix packaging from poudriere Message-ID: <202109141152.18EBqJDu036479@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=72629b6891c832e57808a0bdb686c2433951c546 commit 72629b6891c832e57808a0bdb686c2433951c546 Author: Emmanuel Vadot <manu@FreeBSD.org> AuthorDate: 2021-09-14 11:29:35 +0000 Commit: Emmanuel Vadot <manu@FreeBSD.org> CommitDate: 2021-09-14 11:51:58 +0000 ports-mgmt/pkg-devel: Fix packaging from poudriere 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 --- ports-mgmt/pkg-devel/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile index b59c13f584c5..4d6afe84ec23 100644 --- a/ports-mgmt/pkg-devel/Makefile +++ b/ports-mgmt/pkg-devel/Makefile @@ -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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109141152.18EBqJDu036479>