From owner-svn-ports-all@freebsd.org Mon Sep 30 10:14:19 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 77F5412322B; Mon, 30 Sep 2019 10:14:19 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46hdY72cNMz4flF; Mon, 30 Sep 2019 10:14:19 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3D089FAD; Mon, 30 Sep 2019 10:14:19 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8UAEJZS010071; Mon, 30 Sep 2019 10:14:19 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8UAEIKt010069; Mon, 30 Sep 2019 10:14:18 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <201909301014.x8UAEIKt010069@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Mon, 30 Sep 2019 10:14:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r513342 - head/science/InsightToolkit X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/science/InsightToolkit X-SVN-Commit-Revision: 513342 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Mon, 30 Sep 2019 10:14:19 -0000 Author: pkubaj Date: Mon Sep 30 10:14:18 2019 New Revision: 513342 URL: https://svnweb.freebsd.org/changeset/ports/513342 Log: science/InsightToolkit: fix build with GCC-based architectures Compiling with GCC requires changes in pkg-plist. Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D21428 Modified: head/science/InsightToolkit/Makefile head/science/InsightToolkit/pkg-plist Modified: head/science/InsightToolkit/Makefile ============================================================================== --- head/science/InsightToolkit/Makefile Mon Sep 30 10:08:36 2019 (r513341) +++ head/science/InsightToolkit/Makefile Mon Sep 30 10:14:18 2019 (r513342) @@ -14,8 +14,6 @@ COMMENT= Insight Toolkit LICENSE= APACHE20 -BROKEN_powerpc64= fails to package: ITK_COMPILER_INFO_Clang_CXX.h:No such file or directory - BUILD_DEPENDS= googletest>=0:devel/googletest LIB_DEPENDS= libgdcmCommon.so:devel/gdcm \ libexpat.so:textproc/expat2 \ @@ -56,8 +54,16 @@ TESTING_DESC= Build testing programs (very time consum EXAMPLES_CMAKE_ON= -DBUILD_EXAMPLES:BOOL=ON TESTING_CMAKE_ON= -DBUILD_TESTING:BOOL=ON +.include + +.if ${CHOSEN_COMPILER_TYPE} == gcc +PLIST_SUB+= CHOSEN_COMPILER_TYPE="GNU" +.else +PLIST_SUB+= CHOSEN_COMPILER_TYPE="Clang" +.endif + post-extract: ${MV} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/.ExternalData/* ${WRKSRC}/.ExternalData/ ${RM} -r ${WRKDIR}/${PORTNAME}-${PORTVERSION} -.include +.include Modified: head/science/InsightToolkit/pkg-plist ============================================================================== --- head/science/InsightToolkit/pkg-plist Mon Sep 30 10:08:36 2019 (r513341) +++ head/science/InsightToolkit/pkg-plist Mon Sep 30 10:14:18 2019 (r513342) @@ -138,7 +138,7 @@ include/ITK-%%ITK_VER%%/blas/ztrmm.h include/ITK-%%ITK_VER%%/blas/ztrmv.h include/ITK-%%ITK_VER%%/blas/ztrsv.h include/ITK-%%ITK_VER%%/cached-powers.h -include/ITK-%%ITK_VER%%/compilers/ITK_COMPILER_INFO_Clang_CXX.h +include/ITK-%%ITK_VER%%/compilers/ITK_COMPILER_INFO_%%CHOSEN_COMPILER_TYPE%%_CXX.h include/ITK-%%ITK_VER%%/compilers/VXL_COMPILER_INFO_AppleClang_CXX.h include/ITK-%%ITK_VER%%/compilers/VXL_COMPILER_INFO_Clang_CXX.h include/ITK-%%ITK_VER%%/compilers/VXL_COMPILER_INFO_GNU_CXX.h