Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 31 Dec 2017 03:15:44 +0000 (UTC)
From:      Ben Woods <woodsb02@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r457666 - in head/science/InsightToolkit: . files
Message-ID:  <201712310315.vBV3Fir3091086@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: woodsb02
Date: Sun Dec 31 03:15:44 2017
New Revision: 457666
URL: https://svnweb.freebsd.org/changeset/ports/457666

Log:
  science/InsightToolkit: Fix build (r457496 accidentally excluded patch)

Added:
  head/science/InsightToolkit/files/
  head/science/InsightToolkit/files/patch-Modules_ThirdParty_MINC_src_libminc_CMakeLists.txt   (contents, props changed)
Modified:
  head/science/InsightToolkit/Makefile

Modified: head/science/InsightToolkit/Makefile
==============================================================================
--- head/science/InsightToolkit/Makefile	Sun Dec 31 02:18:15 2017	(r457665)
+++ head/science/InsightToolkit/Makefile	Sun Dec 31 03:15:44 2017	(r457666)
@@ -3,6 +3,7 @@
 
 PORTNAME=	InsightToolkit
 PORTVERSION=	4.13.0
+PORTREVISION=	1
 CATEGORIES=	science biology
 MASTER_SITES=	SF/itk/itk/${ITK_VER}
 

Added: head/science/InsightToolkit/files/patch-Modules_ThirdParty_MINC_src_libminc_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/science/InsightToolkit/files/patch-Modules_ThirdParty_MINC_src_libminc_CMakeLists.txt	Sun Dec 31 03:15:44 2017	(r457666)
@@ -0,0 +1,27 @@
+--- Modules/ThirdParty/MINC/src/libminc/CMakeLists.txt.orig	2017-12-29 06:00:13 UTC
++++ Modules/ThirdParty/MINC/src/libminc/CMakeLists.txt
+@@ -387,8 +387,8 @@ SET(LIBMINC_LIBRARIES ${LIBMINC_LIBRARY} ${HDF5_LIBRAR
+ SET(LIBMINC_STATIC_LIBRARIES ${LIBMINC_LIBRARY_STATIC} ${HDF5_LIBRARIES} ${NIFTI_LIBRARIES} ${ZLIB_LIBRARY})
+ 
+ IF(UNIX)
+-  SET(LIBMINC_LIBRARIES ${LIBMINC_LIBRARIES} m dl ${RT_LIBRARY})
+-  SET(LIBMINC_STATIC_LIBRARIES ${LIBMINC_STATIC_LIBRARIES} m dl  ${RT_LIBRARY})
++  SET(LIBMINC_LIBRARIES ${LIBMINC_LIBRARIES} m ${RT_LIBRARY})
++  SET(LIBMINC_STATIC_LIBRARIES ${LIBMINC_STATIC_LIBRARIES} m ${RT_LIBRARY})
+ ENDIF(UNIX)
+ 
+ SET(minc_LIB_SRCS ${minc2_LIB_SRCS} ${minc_common_SRCS})
+@@ -425,11 +425,11 @@ ENDIF(NOT LIBMINC_USE_SYSTEM_NIFTI  AND NOT LIBMINC_EX
+ #EXPORT(TARGETS ${LIBMINC_LIBRARY} FILE "${LIBMINC_EXPORTED_TARGETS}.cmake")
+ 
+ IF(UNIX)
+-  TARGET_LINK_LIBRARIES(${LIBMINC_LIBRARY}   m dl )
++  TARGET_LINK_LIBRARIES(${LIBMINC_LIBRARY}   m )
+ 
+   IF(LIBMINC_BUILD_SHARED_LIBS)
+     ADD_LIBRARY(${LIBMINC_LIBRARY_STATIC} STATIC ${minc_LIB_SRCS} ${minc_HEADERS} ${volume_io_LIB_SRCS} ${volume_io_HEADERS} )
+-    TARGET_LINK_LIBRARIES(${LIBMINC_LIBRARY_STATIC} ${HDF5_LIBRARY} ${NIFTI_LIBRARIES} ${ZLIB_LIBRARY} ${RT_LIBRARY} m dl )
++    TARGET_LINK_LIBRARIES(${LIBMINC_LIBRARY_STATIC} ${HDF5_LIBRARY} ${NIFTI_LIBRARIES} ${ZLIB_LIBRARY} ${RT_LIBRARY} m )
+     IF(LIBMINC_MINC1_SUPPORT)
+       TARGET_LINK_LIBRARIES(${LIBMINC_LIBRARY} ${NETCDF_LIBRARY})
+     ENDIF(LIBMINC_MINC1_SUPPORT)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712310315.vBV3Fir3091086>