Date: Wed, 3 Jan 2024 06:30: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: 95e83829519a - main - science/InsightToolkit: Eliminate conflict with lp_solve by renaming the shared library Message-ID: <202401030630.4036UFUM001997@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=95e83829519a47602dbebfc270bce61551449d33 commit 95e83829519a47602dbebfc270bce61551449d33 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2024-01-03 06:28:14 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2024-01-03 06:30:13 +0000 science/InsightToolkit: Eliminate conflict with lp_solve by renaming the shared library liblp_solve55.so is renamed into liblp_solve55_itk.so References: * https://github.com/InsightSoftwareConsortium/ITK/issues/4031 * https://github.com/RTKConsortium/RTK/issues/548 --- science/InsightToolkit/Makefile | 10 +++++++++- science/InsightToolkit/pkg-plist | 6 +++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/science/InsightToolkit/Makefile b/science/InsightToolkit/Makefile index 32579b23fe24..9eb3fc1d6439 100644 --- a/science/InsightToolkit/Makefile +++ b/science/InsightToolkit/Makefile @@ -1,7 +1,7 @@ PORTNAME= InsightToolkit DISTVERSIONPREFIX= v DISTVERSION= 5.3.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= science biology MASTER_SITES= https://github.com/InsightSoftwareConsortium/ITK/releases/download/v${DISTVERSION}/:data DISTFILES= InsightData-${DISTVERSION}.tar.gz:data @@ -90,6 +90,14 @@ pre-configure: # workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?i @${SETENV} ${MAKE_ENV} ${CC} -c -fPIC ${FILESDIR}/ftime.c -o ${WRKSRC}/libftime.o @${AR} -rcs ${WRKSRC}/libftime.a ${WRKSRC}/libftime.o +post-configure: # fix conflict with lp_solve by renaming the shared library to liblp_solve55_itk, see https://github.com/InsightSoftwareConsortium/ITK/issues/4031 + @${REINPLACE_CMD} \ + -e 's|lpsolve55|lpsolve55_itk|g' \ + ${WRKSRC}/Modules/Remote/RTK/CMakeLists.txt \ + ${WRKSRC}/Modules/Remote/RTK/src/CMakeLists.txt \ + ${WRKSRC}/Modules/Remote/RTK/utilities/lp_solve/CMakeLists.txt + + post-install: # remove contentless docs @${RM} -r ${STAGEDIR}${PREFIX}/share diff --git a/science/InsightToolkit/pkg-plist b/science/InsightToolkit/pkg-plist index aff18201c8e9..b2301e5560a8 100644 --- a/science/InsightToolkit/pkg-plist +++ b/science/InsightToolkit/pkg-plist @@ -4273,9 +4273,9 @@ lib/libitkopenjpeg-%%ITK_VER%%.so lib/libitkopenjpeg-%%ITK_VER%%.so.1 lib/libitksys-%%ITK_VER%%.so lib/libitksys-%%ITK_VER%%.so.1 -lib/liblpsolve55.so -lib/liblpsolve55.so.5 -lib/liblpsolve55.so.5.5.2 +lib/liblpsolve55_itk.so +lib/liblpsolve55_itk.so.5 +lib/liblpsolve55_itk.so.5.5.2 lib/rtkelektasynergygeometry.py lib/rtkorageometry.py lib/rtksimulatedgeometry.py
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401030630.4036UFUM001997>