From owner-svn-ports-all@freebsd.org Thu Apr 23 11:38:24 2020 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 EA10F2B2AB7; Thu, 23 Apr 2020 11:38:24 +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 497Fg45vtKz4s3p; Thu, 23 Apr 2020 11:38:24 +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 C195D3C32; Thu, 23 Apr 2020 11:38:24 +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 03NBcOfn006724; Thu, 23 Apr 2020 11:38:24 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03NBcOQY006723; Thu, 23 Apr 2020 11:38:24 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202004231138.03NBcOQY006723@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Thu, 23 Apr 2020 11:38:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r532668 - head/misc/opennn X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/misc/opennn X-SVN-Commit-Revision: 532668 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: Thu, 23 Apr 2020 11:38:25 -0000 Author: pkubaj Date: Thu Apr 23 11:38:24 2020 New Revision: 532668 URL: https://svnweb.freebsd.org/changeset/ports/532668 Log: misc/opennn: fix build on GCC architectures and powerpc64 elfv2 clang 8 doesn't have full support for powerpc, powerpc64 or powerpcspe, so use GCC there. On powerpc64 elfv2, the default is to build for elfv1, so pass a flag to fix it. MFH: 2020Q2 (fix build blanket) Modified: head/misc/opennn/Makefile Modified: head/misc/opennn/Makefile ============================================================================== --- head/misc/opennn/Makefile Thu Apr 23 11:06:30 2020 (r532667) +++ head/misc/opennn/Makefile Thu Apr 23 11:38:24 2020 (r532668) @@ -12,7 +12,7 @@ COMMENT= Open neural networks library LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES= cmake dos2unix # compiler:c++11-lang +USES= cmake compiler dos2unix DOS2UNIX_FILES= CMakeLists.txt USE_GITHUB= yes GH_ACCOUNT= Artelnics @@ -29,16 +29,26 @@ MPI_BROKEN= https://github.com/Artelnics/OpenNN/issue OPENMP_CMAKE_BOOL= __OPENNN_OMP__ +.include + +.if ${CHOSEN_COMPILER_TYPE} == gcc +USE_GCC= yes +.else # workaround for breakage with clang-10: https://github.com/Artelnics/OpenNN/issues/105 LLVM_VER= 80 BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER} CPP= clang-cpp${LLVM_VER} CC= clang${LLVM_VER} CXX= clang++${LLVM_VER} +# clang-8 defaults to elfv1 on FreeBSD, to be removed after moving to 9 or newer +.if ${ARCH} == powerpc64 +CFLAGS+= -mabi=elfv2 +.endif +.endif do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME} && ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME} ${INSTALL_DATA} ${BUILD_WRKSRC}/${PORTNAME}/libopennn.so ${STAGEDIR}${PREFIX}/lib ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopennn.so -.include +.include