From owner-svn-ports-all@freebsd.org Sun May 19 02:43:29 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 E1A3615A03B5; Sun, 19 May 2019 02:43:29 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 86B8373202; Sun, 19 May 2019 02:43:29 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1354) id 5AF06111AB; Sun, 19 May 2019 02:43:29 +0000 (UTC) From: Jan Beich To: Yuri Victorovich Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r502004 - head/science/openmx References: <201905190225.x4J2P0IK020444@repo.freebsd.org> Date: Sun, 19 May 2019 04:43:25 +0200 In-Reply-To: <201905190225.x4J2P0IK020444@repo.freebsd.org> (Yuri Victorovich's message of "Sun, 19 May 2019 02:25:00 +0000 (UTC)") Message-ID: <4l5r-tb8y-wny@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain X-Rspamd-Queue-Id: 86B8373202 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.84 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.84)[-0.842,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: Sun, 19 May 2019 02:43:30 -0000 Yuri Victorovich writes: > Author: yuri > Date: Sun May 19 02:24:59 2019 > New Revision: 502004 > URL: https://svnweb.freebsd.org/changeset/ports/502004 > > Log: > science/openmx: Unbreak on 13: /usr/lib/libomp.so conflicting with the 'openmp' package has been added to 13-CURRENT > After r501030 base and port version don't conflict. LIB_DEPENDS still adds an extra dependency. Once 11.2/12.0 reach EOL half a year later the line can be dropped. It's not worth the churn to create new USES or rush bug 210337 fix. > - libomp.so:devel/openmp > + libiomp5.so:devel/openmp -liomp5 is a symlink to -lomp. And devel/openmp will be removed in future. $ ls -l /usr/local/lib/libiomp5.so lrwxr-xr-x 1 root wheel 9 May 18 22:35 /usr/local/lib/libiomp5.so -> libomp.so Index: science/openmx/Makefile =================================================================== --- science/openmx/Makefile (revision 502006) +++ science/openmx/Makefile (working copy) @@ -22,7 +22,7 @@ LIB_DEPENDS= libblas.so:math/blas \ libfftw3.so:math/fftw3 \ liblapack.so:math/lapack \ libmpich.so:net/mpich \ - libiomp5.so:devel/openmp + libomp.so:devel/openmp USES= dos2unix fortran gmake localbase:ldflags DOS2UNIX_FILES= openmx_common.h Index: science/openmx/files/patch-makefile =================================================================== --- science/openmx/files/patch-makefile (revision 502006) +++ science/openmx/files/patch-makefile (working copy) @@ -9,7 +9,7 @@ -LIB= -L/opt/intel/mkl/lib -mkl=parallel -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -lpthread -lifcore -lmpi -lmpi_f90 -lmpi_f77 +CC = mpicc $(CFLAGS) -fopenmp +FC = mpif90 $(FFLAGS) -fopenmp -+LIB= $(LDFLAGS) -lpthread -llapack -lblas -lgfortran -lfftw3 -liomp5 ++LIB= $(LDFLAGS) -lpthread -llapack -lblas -lgfortran -lfftw3 -lomp