From owner-svn-ports-all@freebsd.org Wed Jan 3 12:34:18 2018 Return-Path: Delivered-To: svn-ports-all@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 33070EBD556; Wed, 3 Jan 2018 12:34:18 +0000 (UTC) (envelope-from woodsb02@gmail.com) Received: from mail-vk0-x234.google.com (mail-vk0-x234.google.com [IPv6:2607:f8b0:400c:c05::234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DDAE6726D9; Wed, 3 Jan 2018 12:34:17 +0000 (UTC) (envelope-from woodsb02@gmail.com) Received: by mail-vk0-x234.google.com with SMTP id l63so768887vke.5; Wed, 03 Jan 2018 04:34:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=Cw/VGHC1IM6q0851fIDuq4t2cNUEYomPD753ZsrI7qA=; b=YkxjTKlzbsJ4OcJwCdnaeA0RAn6rz/5oG3cgZ5/6cmxtHLlNy7SXX9Ja2UqKgQyPDm G+aB4EZFw9cIL/v7HEim0sI/8C8WnPFORqYBdy1V0cZRZ6yqf9WQBzfjSeMKJRdTFgUv ZUriV6EtEMM/8Uq7obWM1tds7ibw+YxCPGvfmmARgAGzqjKYJWADYEv4yBtcKsDkHQpJ 3xq0CmpMgKBMxL7Y1RTW25CJTWvV+pPPuBC71JQdztYkxSUdpJd+1iSCprr5AeyifL+U lBouI5OqFdaQ9dvQMZYAHW7IYxpbqtniG1sGqkc/e8sBEahfsgaiH6kaVec6C4I4X3Ez uT4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=Cw/VGHC1IM6q0851fIDuq4t2cNUEYomPD753ZsrI7qA=; b=YcmTqu3YwPo8bdsaQXanY1sQ68RgXa1JIxsX++/V4NhN2qnGbxLwmwzTv93qtYuf4M Lagjdf/3Isc3PrUDMl+EtWJl05E44FnUasFjGSrvzgNPDLiYqGj33d+nsI+dAnkHKb64 ZUmUBZfZ7Iw8J6EN431difwePqW0D22HtRBdLj5DM5u2F9ywmkeXXBF7gscSXZQra0vt g5VaTZ+vojXYSpsQuhBycVzvidTISRoQ4lVzc48p0r7Ec6K4TnWwilTkmSnebPxN1KaU hqp/Twb6aNWucO+PCxMBTNnHCdx77Nh4bwOe7iAsLJy14OeLMINiNxVq6kn1w2B2+JUj TNEA== X-Gm-Message-State: AKGB3mJTK3bXzz0+dvVN9iwUhXy1NSRNMj5QG9ZQlvLFZSa29DmKJAB/ 0VGC1XXbtJzI8mGxp/E7cpM4p37KUk2qfRhA9SVD/RIb X-Google-Smtp-Source: ACJfBov1xdowEfNKUMElOVVuMIqz8oML0DYm8tmUAK669YCRh4fYutssX4OmEAN4xoo+X+2Y3r6bryO5hoKHEWfIf3Q= X-Received: by 10.31.171.196 with SMTP id u187mr1067232vke.141.1514982856502; Wed, 03 Jan 2018 04:34:16 -0800 (PST) MIME-Version: 1.0 Received: by 10.31.233.198 with HTTP; Wed, 3 Jan 2018 04:34:15 -0800 (PST) In-Reply-To: References: <201712310315.vBV3Fir3091086@repo.freebsd.org> From: Ben Woods Date: Wed, 3 Jan 2018 20:34:15 +0800 Message-ID: Subject: Re: svn commit: r457666 - in head/science/InsightToolkit: . files To: Jan Beich Cc: Ben Woods , "ports-committers@FreeBSD.org" , svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.25 X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jan 2018 12:34:18 -0000 On 31 December 2017 at 12:52, Jan Beich wrote: > 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. > Thanks for the head up. Fixed in 457958 and merged to 2018Q1. Cheers, Ben -- From: Benjamin Woods woodsb02@gmail.com