From owner-svn-ports-head@freebsd.org Sun Dec 31 04:52:14 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5F8D1E9F887; Sun, 31 Dec 2017 04:52:14 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4014B1657; Sun, 31 Dec 2017 04:52:14 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1354) id 6BE141EB27; Sun, 31 Dec 2017 04:52:13 +0000 (UTC) From: Jan Beich To: Ben Woods Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r457666 - in head/science/InsightToolkit: . files References: <201712310315.vBV3Fir3091086@repo.freebsd.org> Date: Sun, 31 Dec 2017 05:52:07 +0100 In-Reply-To: <201712310315.vBV3Fir3091086@repo.freebsd.org> (Ben Woods's message of "Sun, 31 Dec 2017 03:15:44 +0000 (UTC)") Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Dec 2017 04:52:14 -0000 Ben Woods writes: > 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) Maybe convert to ${CMAKE_DL_LIBS} instead. It expands to "" on FreeBSD and "dl" on Linux.