Hi all,
Here is the updated patch, with these features:
- added OpenMP libraries etc from the build to the packages
- added info file for OpenMP
- updated packing-list (@so @static-lib)
- bumped REVISION
The list of ports that may need patches for OpenMP is
- graphics/libraw
- audio/libsoxr
- math/ecm (not sure if this one uses OpenMP by default)
I've previously published patches for these.
thanks for looking at this
John
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/gcc/8/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile 5 Apr 2020 15:44:52 -0000 1.31
+++ Makefile 27 Jun 2020 14:20:32 -0000
@@ -16,7 +16,7 @@ USE_LLD = No
DPB_PROPERTIES = parallel
V = 8.3.0
-REVISION = 5
+REVISION = 6
FULL_VERSION = $V
FULL_PKGVERSION = $V
@@ -42,6 +42,7 @@ SHARED_LIBS = estdc++ 19.0 \
lto_plugin 5.0 \
itm 4.0 \
atomic 3.0 \
+ gomp 1.0 \
quadmath 3.0 \
cc1 1.0 \
cc1plugin 1.0 \
@@ -123,7 +124,6 @@ CONFIGURE_ARGS += \
--disable-nls \
--with-system-zlib \
--disable-libmudflap \
- --disable-libgomp \
--disable-libssp \
--disable-tls \
--with-gnu-ld \
Index: pkg/PFRAG.ITM-main
===================================================================
RCS file: /cvs/ports/lang/gcc/8/pkg/PFRAG.ITM-main,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PFRAG.ITM-main
--- pkg/PFRAG.ITM-main 4 Jan 2019 15:50:40 -0000 1.1.1.1
+++ pkg/PFRAG.ITM-main 27 Jun 2020 14:20:32 -0000
@@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.ITM-main,v 1.1.1.1 2019/01/04 15:50:40 pascal Exp $
@info info/libitm.info
-lib/libitm.a
+@static-lib lib/libitm.a
lib/libitm.spec
Index: pkg/PFRAG.QUADMATH-main
===================================================================
RCS file: /cvs/ports/lang/gcc/8/pkg/PFRAG.QUADMATH-main,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PFRAG.QUADMATH-main
--- pkg/PFRAG.QUADMATH-main 4 Jan 2019 15:50:40 -0000 1.1.1.1
+++ pkg/PFRAG.QUADMATH-main 27 Jun 2020 14:20:32 -0000
@@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.QUADMATH-main,v 1.1.1.1 2019/01/04 15:50:40 pascal
Exp $
@info info/libquadmath.info
-lib/libquadmath.a
+@static-lib lib/libquadmath.a
Index: pkg/PLIST-ada
===================================================================
RCS file: /cvs/ports/lang/gcc/8/pkg/PLIST-ada,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-ada
--- pkg/PLIST-ada 27 Apr 2019 21:26:35 -0000 1.2
+++ pkg/PLIST-ada 27 Jun 2020 14:20:32 -0000
@@ -1703,15 +1703,15 @@ lib/gcc/${CONFIG}/${V}/adalib/i-fortra.a
lib/gcc/${CONFIG}/${V}/adalib/i-pacdec.ali
lib/gcc/${CONFIG}/${V}/adalib/interfac.ali
lib/gcc/${CONFIG}/${V}/adalib/ioexcept.ali
-lib/gcc/${CONFIG}/${V}/adalib/libgmem.a
-lib/gcc/${CONFIG}/${V}/adalib/libgnarl-8.so
-lib/gcc/${CONFIG}/${V}/adalib/libgnarl.a
-lib/gcc/${CONFIG}/${V}/adalib/libgnarl.so
-lib/gcc/${CONFIG}/${V}/adalib/libgnarl_pic.a
-lib/gcc/${CONFIG}/${V}/adalib/libgnat-8.so
-lib/gcc/${CONFIG}/${V}/adalib/libgnat.a
-lib/gcc/${CONFIG}/${V}/adalib/libgnat.so
-lib/gcc/${CONFIG}/${V}/adalib/libgnat_pic.a
+@static-lib lib/gcc/${CONFIG}/${V}/adalib/libgmem.a
+@so lib/gcc/${CONFIG}/${V}/adalib/libgnarl-8.so
+@static-lib lib/gcc/${CONFIG}/${V}/adalib/libgnarl.a
+@so lib/gcc/${CONFIG}/${V}/adalib/libgnarl.so
+@static-lib lib/gcc/${CONFIG}/${V}/adalib/libgnarl_pic.a
+@so lib/gcc/${CONFIG}/${V}/adalib/libgnat-8.so
+@static-lib lib/gcc/${CONFIG}/${V}/adalib/libgnat.a
+@so lib/gcc/${CONFIG}/${V}/adalib/libgnat.so
+@static-lib lib/gcc/${CONFIG}/${V}/adalib/libgnat_pic.a
lib/gcc/${CONFIG}/${V}/adalib/machcode.ali
lib/gcc/${CONFIG}/${V}/adalib/memtrack.ali
lib/gcc/${CONFIG}/${V}/adalib/s-addima.ali
Index: pkg/PLIST-c++
===================================================================
RCS file: /cvs/ports/lang/gcc/8/pkg/PLIST-c++,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-c++
--- pkg/PLIST-c++ 27 Apr 2019 21:26:35 -0000 1.2
+++ pkg/PLIST-c++ 27 Jun 2020 14:20:32 -0000
@@ -801,11 +801,11 @@ include/c++/${V}/${CONFIG}/bits/stdtr1c+
include/c++/${V}/${CONFIG}/bits/time_members.h
include/c++/${V}/${CONFIG}/ext/
include/c++/${V}/${CONFIG}/ext/opt_random.h
-lib/libestdc++.a
-lib/libesupc++.a
+@static-lib lib/libestdc++.a
+@static-lib lib/libesupc++.a
lib/libesupc++.la
lib/libstdc++.*-gdb.py
-lib/libstdc++fs.a
+@static-lib lib/libstdc++fs.a
lib/libstdc++fs.la
@bin libexec/gcc/${CONFIG}/${V}/cc1plus
@man man/man1/eg++.1
Index: pkg/PLIST-f95
===================================================================
RCS file: /cvs/ports/lang/gcc/8/pkg/PLIST-f95,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-f95
--- pkg/PLIST-f95 27 Apr 2019 21:26:35 -0000 1.2
+++ pkg/PLIST-f95 27 Jun 2020 14:20:32 -0000
@@ -11,9 +11,17 @@ lib/gcc/${CONFIG}/${V}/finclude/
lib/gcc/${CONFIG}/${V}/finclude/ieee_arithmetic.mod
lib/gcc/${CONFIG}/${V}/finclude/ieee_exceptions.mod
lib/gcc/${CONFIG}/${V}/finclude/ieee_features.mod
-lib/gcc/${CONFIG}/${V}/libcaf_single.a
+lib/gcc/${CONFIG}/${V}/finclude/omp_lib.h
+lib/gcc/${CONFIG}/${V}/finclude/omp_lib.mod
+lib/gcc/${CONFIG}/${V}/finclude/omp_lib_kinds.mod
+lib/gcc/${CONFIG}/${V}/finclude/omp_lib.f90
+lib/gcc/${CONFIG}/${V}/finclude/openacc.f90
+lib/gcc/${CONFIG}/${V}/finclude/openacc.mod
+lib/gcc/${CONFIG}/${V}/finclude/openacc_kinds.mod
+lib/gcc/${CONFIG}/${V}/finclude/openacc_lib.h
+@static-lib lib/gcc/${CONFIG}/${V}/libcaf_single.a
lib/gcc/${CONFIG}/${V}/libcaf_single.la
-lib/libgfortran.a
+@static-lib lib/libgfortran.a
lib/libgfortran.spec
@bin libexec/gcc/${CONFIG}/${V}/f951
@man man/man1/egfortran.1
Index: pkg/PLIST-libs
===================================================================
RCS file: /cvs/ports/lang/gcc/8/pkg/PLIST-libs,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-libs
--- pkg/PLIST-libs 27 Apr 2019 21:26:35 -0000 1.2
+++ pkg/PLIST-libs 27 Jun 2020 14:20:32 -0000
@@ -5,13 +5,15 @@
@pkgpath lang/gcc/4.9,-libs
lib/libatomic.la
@lib lib/libatomic.so.${LIBatomic_VERSION}
+lib/libcc1.la
+@lib lib/libcc1.so.${LIBcc1_VERSION}
lib/libestdc++.la
@lib lib/libestdc++.so.${LIBestdc++_VERSION}
lib/libgfortran.la
@lib lib/libgfortran.so.${LIBgfortran_VERSION}
-lib/libobjc.la
-@lib lib/libobjc.so.${LIBobjc_VERSION}
-lib/libcc1.la
-@lib lib/libcc1.so.${LIBcc1_VERSION}
+lib/libgomp.la
+@lib lib/libgomp.so.${LIBgomp_VERSION}
%%ITM%%
%%QUADMATH%%
+lib/libobjc.la
+@lib lib/libobjc.so.${LIBobjc_VERSION}
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/gcc/8/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-main
--- pkg/PLIST-main 27 Apr 2019 21:26:35 -0000 1.2
+++ pkg/PLIST-main 27 Jun 2020 14:20:32 -0000
@@ -20,6 +20,7 @@
@info info/gcc.info
@info info/gccinstall.info
@info info/gccint.info
+@info info/libgomp.info
lib/gcc/
lib/gcc/${CONFIG}/
lib/gcc/${CONFIG}/${V}/
@@ -29,10 +30,13 @@ lib/gcc/${CONFIG}/${V}/include-fixed/REA
lib/gcc/${CONFIG}/${V}/include-fixed/limits.h
lib/gcc/${CONFIG}/${V}/include-fixed/syslimits.h
lib/gcc/${CONFIG}/${V}/include/gcov.h
+lib/gcc/${CONFIG}/${V}/include/omp.h
+lib/gcc/${CONFIG}/${V}/include/openacc.h
lib/gcc/${CONFIG}/${V}/include/stdalign.h
lib/gcc/${CONFIG}/${V}/include/stdatomic.h
lib/gcc/${CONFIG}/${V}/include/stdfix.h
lib/gcc/${CONFIG}/${V}/include/stdnoreturn.h
+%%ITM%%
lib/gcc/${CONFIG}/${V}/install-tools/
lib/gcc/${CONFIG}/${V}/install-tools/fixinc_list
lib/gcc/${CONFIG}/${V}/install-tools/gsyslimits.h
@@ -41,8 +45,8 @@ lib/gcc/${CONFIG}/${V}/install-tools/inc
lib/gcc/${CONFIG}/${V}/install-tools/include/limits.h
lib/gcc/${CONFIG}/${V}/install-tools/macro_list
lib/gcc/${CONFIG}/${V}/install-tools/mkheaders.conf
-lib/gcc/${CONFIG}/${V}/libgcc.a
-lib/gcc/${CONFIG}/${V}/libgcov.a
+@static-lib lib/gcc/${CONFIG}/${V}/libgcc.a
+@static-lib lib/gcc/${CONFIG}/${V}/libgcov.a
lib/gcc/${CONFIG}/${V}/plugin/
lib/gcc/${CONFIG}/${V}/plugin/gtype.state
lib/gcc/${CONFIG}/${V}/plugin/include/
@@ -98,6 +102,15 @@ lib/gcc/${CONFIG}/${V}/plugin/include/co
lib/gcc/${CONFIG}/${V}/plugin/include/conditions.h
lib/gcc/${CONFIG}/${V}/plugin/include/config/
lib/gcc/${CONFIG}/${V}/plugin/include/config.h
+%%arm%%
+%%hppa%%
+%%i386%%
+%%mips64%%
+%%mips64el%%
+%%powerpc%%
+%%sparc64%%
+%%X86%%
+%%QUADMATH%%
lib/gcc/${CONFIG}/${V}/plugin/include/configargs.h
lib/gcc/${CONFIG}/${V}/plugin/include/context.h
lib/gcc/${CONFIG}/${V}/plugin/include/convert.h
@@ -450,20 +463,12 @@ lib/gcc/${CONFIG}/${V}/plugin/libcc1plug
@lib lib/gcc/${CONFIG}/${V}/plugin/libcc1plugin.so.${LIBcc1plugin_VERSION}
lib/gcc/${CONFIG}/${V}/plugin/libcp1plugin.la
@lib lib/gcc/${CONFIG}/${V}/plugin/libcp1plugin.so.${LIBcp1plugin_VERSION}
-lib/libatomic.a
+@static-lib lib/libatomic.a
+@static-lib lib/libgomp.a
+lib/libgomp.spec
%%aarch64%%
%%alpha%%
%%amd64%%
-%%arm%%
-%%hppa%%
-%%i386%%
-%%mips64%%
-%%mips64el%%
-%%powerpc%%
-%%sparc64%%
-%%X86%%
-%%ITM%%
-%%QUADMATH%%
libexec/gcc/
libexec/gcc/${CONFIG}/
libexec/gcc/${CONFIG}/${V}/
Index: pkg/PLIST-objc
===================================================================
RCS file: /cvs/ports/lang/gcc/8/pkg/PLIST-objc,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-objc
--- pkg/PLIST-objc 27 Apr 2019 21:26:35 -0000 1.2
+++ pkg/PLIST-objc 27 Jun 2020 14:20:32 -0000
@@ -13,5 +13,5 @@ lib/gcc/${CONFIG}/${V}/include/objc/objc
lib/gcc/${CONFIG}/${V}/include/objc/objc.h
lib/gcc/${CONFIG}/${V}/include/objc/runtime.h
lib/gcc/${CONFIG}/${V}/include/objc/thr.h
-lib/libobjc.a
+@static-lib lib/libobjc.a
@bin libexec/gcc/${CONFIG}/${V}/cc1obj
