Date: Sun, 19 May 2019 04:43:25 +0200 From: Jan Beich <jbeich@FreeBSD.org> To: Yuri Victorovich <yuri@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r502004 - head/science/openmx Message-ID: <4l5r-tb8y-wny@FreeBSD.org> In-Reply-To: <201905190225.x4J2P0IK020444@repo.freebsd.org> (Yuri Victorovich's message of "Sun, 19 May 2019 02:25:00 %2B0000 (UTC)") References: <201905190225.x4J2P0IK020444@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Yuri Victorovich <yuri@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4l5r-tb8y-wny>