Date: Sun, 07 May 2023 02:04:31 +0200 From: Daniel Engberg <diizzy@FreeBSD.org> To: ports-committers@freebsd.org Cc: dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: af209cebad90 - main - Mk/bsd.port.mk: Enable verbose output when pkgconfig file(s) ends up in wrong path Message-ID: <25b14db78b8faceae7ba70d98703a2f9@FreeBSD.org> In-Reply-To: <202305060548.3465mAC1031155@gitrepo.freebsd.org> References: <202305060548.3465mAC1031155@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 2023-05-06 07:48, Daniel Engberg wrote: > The branch main has been updated by diizzy: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=af209cebad90f67199b65c0c1737f7d187498a12 > > commit af209cebad90f67199b65c0c1737f7d187498a12 > Author: Daniel Engberg <diizzy@FreeBSD.org> > AuthorDate: 2023-05-06 05:44:57 +0000 > Commit: Daniel Engberg <diizzy@FreeBSD.org> > CommitDate: 2023-05-06 05:47:44 +0000 > > Mk/bsd.port.mk: Enable verbose output when pkgconfig file(s) ends > up in wrong path > > To avoid confusion and silently fix issues that occurs > > Reviewed by: mat > Approved by: portmgr (bofh) > --- > Mk/bsd.port.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk > index 0133d7242579..703a8541e383 100644 > --- a/Mk/bsd.port.mk > +++ b/Mk/bsd.port.mk > @@ -3531,6 +3531,10 @@ install-ldconfig-file: > fixup-lib-pkgconfig: > @if [ -d ${STAGEDIR}${PREFIX}/lib/pkgconfig ]; then \ > if [ -z "$$(${FIND} ${STAGEDIR}${PREFIX}/lib/pkgconfig -maxdepth 0 > -empty)" ]; then \ > + if [ -n "${DEVELOPER:Dyes}" ]; then \ > + ${ECHO_MSG} "===> File(s) found in lib/pkgconfig while correct > path is libdata/pkgconfig"; \ > + ${ECHO_MSG} " Applying fix but consider using USES= pathfix > or adjust install path"; \ > + fi; \ > ${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig; \ > ${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/* > ${STAGEDIR}${PREFIX}/libdata/pkgconfig; \ > fi; \ Hi, I apologize for incorrect commit message, it should've also referenced: https://reviews.freebsd.org/D38136 Best regards, Daniel
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?25b14db78b8faceae7ba70d98703a2f9>