From owner-svn-ports-all@freebsd.org Fri Jul 12 23:58:23 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 298B615DA5E8; Fri, 12 Jul 2019 23:58:23 +0000 (UTC) (envelope-from jwb@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 BD3B1923D1; Fri, 12 Jul 2019 23:58:22 +0000 (UTC) (envelope-from jwb@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 970211DEEC; Fri, 12 Jul 2019 23:58:22 +0000 (UTC) (envelope-from jwb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6CNwMgk005179; Fri, 12 Jul 2019 23:58:22 GMT (envelope-from jwb@FreeBSD.org) Received: (from jwb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6CNwMVd005178; Fri, 12 Jul 2019 23:58:22 GMT (envelope-from jwb@FreeBSD.org) Message-Id: <201907122358.x6CNwMVd005178@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jwb set sender to jwb@FreeBSD.org using -f From: "Jason W. Bacon" Date: Fri, 12 Jul 2019 23:58:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r506497 - in head/biology/ncbi-blast+: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jwb X-SVN-Commit-Paths: in head/biology/ncbi-blast+: . files X-SVN-Commit-Revision: 506497 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: BD3B1923D1 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.972,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] 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: Fri, 12 Jul 2019 23:58:23 -0000 Author: jwb Date: Fri Jul 12 23:58:22 2019 New Revision: 506497 URL: https://svnweb.freebsd.org/changeset/ports/506497 Log: ncbi-blast+: Unbreak build with gcc8 following gcc9 patch GCC 8 and 9 are incompatible in handling const variables with OpenMP default(none). All const variables default to shared even with default(none) present. 8 errors out if a const variable is explicitly defined as shared and 9 requires an explicit definition. Using an upstream trunk patch for now, which checks the compiler version. Also discussing more portable approaches to avoid future issues. Reported by: jrm Modified: head/biology/ncbi-blast+/Makefile head/biology/ncbi-blast+/files/patch-src_objtools_blast_seqdb__reader_test_seqdb__perf.cpp Modified: head/biology/ncbi-blast+/Makefile ============================================================================== --- head/biology/ncbi-blast+/Makefile Fri Jul 12 23:55:54 2019 (r506496) +++ head/biology/ncbi-blast+/Makefile Fri Jul 12 23:58:22 2019 (r506497) @@ -2,7 +2,7 @@ PORTNAME= ncbi-blast+ DISTVERSION= 2.9.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= biology perl5 python MASTER_SITES= https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/LATEST/ \ https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${PORTVERSION}/ Modified: head/biology/ncbi-blast+/files/patch-src_objtools_blast_seqdb__reader_test_seqdb__perf.cpp ============================================================================== --- head/biology/ncbi-blast+/files/patch-src_objtools_blast_seqdb__reader_test_seqdb__perf.cpp Fri Jul 12 23:55:54 2019 (r506496) +++ head/biology/ncbi-blast+/files/patch-src_objtools_blast_seqdb__reader_test_seqdb__perf.cpp Fri Jul 12 23:58:22 2019 (r506497) @@ -1,14 +1,16 @@ ---- src/objtools/blast/seqdb_reader/test/seqdb_perf.cpp.orig 2019-07-10 10:11:51.713901000 -0500 -+++ src/objtools/blast/seqdb_reader/test/seqdb_perf.cpp 2019-07-10 10:15:40.994964000 -0500 -@@ -137,8 +137,10 @@ CSeqDBPerfApp::x_ScanDatabase() +--- src/objtools/blast/seqdb_reader/test/seqdb_perf.cpp.orig 2018-10-23 19:28:52 UTC ++++ src/objtools/blast/seqdb_reader/test/seqdb_perf.cpp +@@ -137,8 +137,13 @@ CSeqDBPerfApp::x_ScanDatabase() } LOG_POST(Info << "Will go over " << oids2iterate.size() << " sequences"); -+ // kScanUncompressed is read only and initialized before threading -+ // so shared should be fine here ++#if defined(NCBI_COMPILER_GCC) && (NCBI_COMPILER_VERSION >= 900) #pragma omp parallel default(none) num_threads(m_DbHandles.size()) \ -- shared(oids2iterate) if(m_DbHandles.size() > 1) + shared(oids2iterate,kScanUncompressed) if(m_DbHandles.size() > 1) ++#else ++ #pragma omp parallel default(none) num_threads(m_DbHandles.size()) \ + shared(oids2iterate) if(m_DbHandles.size() > 1) ++#endif { int thread_id = 0; #ifdef _OPENMP