svn commit: r348118 - in stable/11: lib/libomp tools/build/mk

[Dimitry Andric]

Author: dim
Date: Wed May 22 19:39:55 2019
New Revision: 348118
URL: https://svnweb.freebsd.org/changeset/base/348118

Log:
  MFC r347978:
  
  Fix OptionalObsoleteFiles copy/paste mistake from r345236, which
  connected libomp to the build.  The comparison should not have been
  against ${MK_OPENSSH}, but against ${MK_OPENMP}, obviously.
  
  MFC r347979:
  
  To avoid unnecessarily modifying ports, add a -lgomp symlink, since GCC
  does not ship a -lomp symlink.  Also update OptionalObsoleteFiles for
  this, and add 32-bit variants while here.
  
  Approved by:	re (gjb)
  Submitted by:	jbeich
  PR:		237975

Modified:
  stable/11/lib/libomp/Makefile
  stable/11/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/lib/libomp/Makefile
==============================================================================
--- stable/11/lib/libomp/Makefile	Wed May 22 18:43:48 2019	(r348117)
+++ stable/11/lib/libomp/Makefile	Wed May 22 19:39:55 2019	(r348118)
@@ -68,4 +68,6 @@ VERSION_MAP=	${OMPSRC}/exports_so.txt
 LIBADD+=	pthread
 LIBADD+=	m
 
+SYMLINKS+=	${SHLIB_NAME} ${LIBDIR}/libgomp.so
+
 .include <bsd.lib.mk>

Modified: stable/11/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/11/tools/build/mk/OptionalObsoleteFiles.inc	Wed May 22 18:43:48 2019	(r348117)
+++ stable/11/tools/build/mk/OptionalObsoleteFiles.inc	Wed May 22 19:39:55 2019	(r348118)
@@ -2434,12 +2434,16 @@ OLD_FILES+=usr/include/omp.h
 .endif
 OLD_FILES+=usr/lib/libgcov.a
 OLD_FILES+=usr/lib/libgomp.a
+.if ${MK_OPENMP} == no
 OLD_FILES+=usr/lib/libgomp.so
+.endif
 OLD_LIBS+=usr/lib/libgomp.so.1
 OLD_FILES+=usr/lib/libgomp_p.a
 OLD_FILES+=usr/lib32/libgcov.a
 OLD_FILES+=usr/lib32/libgomp.a
+.if ${MK_OPENMP} == no
 OLD_FILES+=usr/lib32/libgomp.so
+.endif
 OLD_LIBS+=usr/lib32/libgomp.so.1
 OLD_FILES+=usr/lib32/libgomp_p.a
 OLD_FILES+=usr/libexec/cc1
@@ -6847,11 +6851,14 @@ OLD_FILES+=usr/share/man/man8/ntpq.8.gz
 OLD_FILES+=usr/share/man/man8/ntptime.8.gz
 .endif
 
-.if ${MK_OPENSSH} == no
+.if ${MK_OPENMP} == no
 .if ${MK_GCC} == no
 OLD_FILES+=usr/include/omp.h
+OLD_LIBS+=usr/lib/libgomp.so
+OLD_LIBS+=usr/lib32/libgomp.so
 .endif
 OLD_LIBS+=usr/lib/libomp.so
+OLD_LIBS+=usr/lib32/libomp.so
 .endif
 
 .if ${MK_OPENSSH} == no