From owner-svn-ports-all@freebsd.org Sat May 2 23:19:03 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 DCEE72C79BE; Sat, 2 May 2020 23:19:03 +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 49F4nM5XSVz3KVM; Sat, 2 May 2020 23:19:03 +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 B94581549; Sat, 2 May 2020 23:19:03 +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 042NJ3BU060711; Sat, 2 May 2020 23:19:03 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 042NJ39r060710; Sat, 2 May 2020 23:19:03 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202005022319.042NJ39r060710@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Sat, 2 May 2020 23:19:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r533711 - head/math/blis X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/math/blis X-SVN-Commit-Revision: 533711 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: Sat, 02 May 2020 23:19:03 -0000 Author: pkubaj Date: Sat May 2 23:19:03 2020 New Revision: 533711 URL: https://svnweb.freebsd.org/changeset/ports/533711 Log: math/blis: fix build on GCC architectures Use GCC on GCC architectures, LLVM causes errors: ld: error: crtstuff.c:(.text+0x16): relocation R_PPC64_TOC16_DS out of range: -32824 is not in [-32768, 32767] ld: error: crtstuff.c:(.text+0x2E): relocation R_PPC64_TOC16_DS out of range: -32816 is not in [-32768, 32767] ld: error: crtstuff.c:(.text+0x3A): relocation R_PPC64_TOC16_DS out of range: -32808 is not in [-32768, 32767] ld: error: crtstuff.c:(.text+0x40): call lacks nop, can't restore toc ld: error: crtstuff.c:(.text+0x4A): relocation R_PPC64_TOC16_DS out of range: -32800 is not in [-32768, 32767] ld: error: crtstuff.c:(.text+0xC2): relocation R_PPC64_TOC16_DS out of range: -32792 is not in [-32768, 32767] ld: error: crtstuff.c:(.text+0xDA): relocation R_PPC64_TOC16_DS out of range: -32784 is not in [-32768, 32767] ld: error: crtstuff.c:(.text+0x12): relocation R_PPC64_TOC16_DS out of range: -32776 is not in [-32768, 32767] clang-9: error: linker command failed with exit code 1 (use -v to see invocation) PR: 246125 Approved by: jmd (maintainer) Modified: head/math/blis/Makefile Modified: head/math/blis/Makefile ============================================================================== --- head/math/blis/Makefile Sat May 2 23:06:47 2020 (r533710) +++ head/math/blis/Makefile Sat May 2 23:19:03 2020 (r533711) @@ -11,9 +11,7 @@ COMMENT= Software framework for high-performance BLAS- LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -LLVM_VER= 90 -BUILD_DEPENDS= bash:shells/bash \ - llvm${LLVM_VER}>=0:devel/llvm${LLVM_VER} +BUILD_DEPENDS= bash:shells/bash OPTIONS_DEFINE= PARA CBLAS PARA_DESC= use pthread parallelization @@ -24,7 +22,7 @@ OPTIONS_SUB= yes USE_GITHUB= yes GH_ACCOUNT= flame -USES= gmake python shebangfix +USES= compiler gmake python shebangfix USE_LDCONFIG= yes SHEBANG_FILES= build/flatten-headers.py @@ -57,7 +55,15 @@ CONFIGURE_ARGS+= generic PLIST_SUB+= ARCH="generic" .endif +.include + +.if ${CHOSEN_COMPILER_TYPE} == gcc +USE_GCC= yes +.else +LLVM_VER= 90 +BUILD_DEPENDS+= llvm${LLVM_VER}>=0:devel/llvm${LLVM_VER} CC= ${LOCALBASE}/bin/clang${LLVM_VER} CXX= ${LOCALBASE}/bin/clang++${LLVM_VER} +.endif -.include +.include