Author: dim
Date: Sun May 19 20:13:55 2019
New Revision: 347979
URL: https://svnweb.freebsd.org/changeset/base/347979
Log:
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.
Submitted by: jbeich
PR: 237975
MFC after: 3 days
Modified:
head/lib/libomp/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/lib/libomp/Makefile
==============================================================================
--- head/lib/libomp/Makefile Sun May 19 19:42:35 2019 (r347978)
+++ head/lib/libomp/Makefile Sun May 19 20:13:55 2019 (r347979)
@@ -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: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc Sun May 19 19:42:35
2019 (r347978)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Sun May 19 20:13:55
2019 (r347979)
@@ -2746,12 +2746,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
@@ -7752,8 +7756,11 @@ OLD_FILES+=usr/share/man/man8/vendstat.8.gz
.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
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
