Date: Sun, 18 Aug 2024 10:33:15 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 10e6520abef9 - main - graphics/lightzone: Force-link to the default GCC libs Message-ID: <202408181033.47IAXFCJ051206@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=10e6520abef913ffe31ad0b01840b354f49cf8a8 commit 10e6520abef913ffe31ad0b01840b354f49cf8a8 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2024-08-18 10:26:26 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2024-08-18 10:33:11 +0000 graphics/lightzone: Force-link to the default GCC libs Current default is GCC13, but it was linking to /usr/local/lib/gcc12/libstdc++.so.6 when GCC12 was also installed. PR: 279723 --- graphics/lightzone/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/graphics/lightzone/Makefile b/graphics/lightzone/Makefile index 3259e35eec6e..dc628b8eb867 100644 --- a/graphics/lightzone/Makefile +++ b/graphics/lightzone/Makefile @@ -1,7 +1,7 @@ PORTNAME= lightzone DISTVERSION= 4.1.8-3 DISTVERSIONSUFFIX= -g36e87773 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= graphics java DIST_SUBDIR= ${PORTNAME} @@ -62,5 +62,7 @@ do-install: ${INSTALL_LIB} ${WRKSRC}/products/*.so ${STAGEDIR}${LIBDIR} ${INSTALL_DATA} ${WRKSRC}/products/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/ @cd ${WRKSRC} && ${COPYTREE_SHARE} icons ${STAGEDIR}${PREFIX}/share/ + # fix the GCC dependency problem (it uses gcc12 libs instead of default gcc13 libs when gcc12 is installed) + ${REINPLACE_CMD} -e 's|LD_LIBRARY_PATH=|LD_LIBRARY_PATH=${LOCALBASE}/lib/gcc${GCC_DEFAULT}:|' ${STAGEDIR}${PREFIX}/bin/lightzone .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408181033.47IAXFCJ051206>