svn commit: r502004 - head/science/openmx
Jan Beich
jbeich at FreeBSD.org
Sun May 19 02:43:30 UTC 2019
Yuri Victorovich <yuri at 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
More information about the svn-ports-head
mailing list