Hi Pascal,

On 2020-06-26 15:03, Pascal Stumpf wrote:
On Fri, 26 Jun 2020 23:01:29 +0200, Pascal Stumpf wrote:
On Fri, 19 Jun 2020 11:50:48 -0700 (PDT), j...@bitminer.ca wrote:
> This patch adjusts gcc-ports to add the various OpenMP libraries
> already built to PLIST(s).
>
> Since ports were already patched to disable OpenMP this change
> should likely result in no issues.
>
>
> John

Comment is unnecessary, otherwise looks good gcc-portwise.  Are we
positive this has no ill effects anywhere at this point? Have you done
a bulk on sparc64?

I did a check of all ports using various means like github search,
source checks, sqlports reviews etc last August and most should be
immune to having OpenMP become available (where "immune" means
they continue to operate single-threaded).  I've also been
watching ports-cvs.  Doubtless some have slipped through.

See

https://marc.info/?l=openbsd-ports&m=156470447814218&w=2

for more details.

I don't have access to a sparc nor a bulk-build capability.


Sorry, further comment: .a and .spec should go into PLIST-main.


Could you perhaps explain why? These would seem to me to be unused
unless gcc-libs was installed for the shared image.


thanks

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       19 Jun 2020 18:36:56 -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 \
> @@ -117,13 +118,13 @@ MAKE_ENV += ${EXTRA_ENV}
>
>  CFLAGS = -O2 -g
>
> +## disable=libgomp off
>  CONFIGURE_ARGS += \
>    --verbose \
>    --program-transform-name=s,^,e, \
>    --disable-nls  \
>    --with-system-zlib \
>    --disable-libmudflap \
> -  --disable-libgomp \
>    --disable-libssp \
>    --disable-tls \
>    --with-gnu-ld \
> 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  19 Jun 2020 18:36:56 -0000
> @@ -11,6 +11,9 @@ 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}/finclude/omp_lib_kinds.mod
> +lib/gcc/${CONFIG}/${V}/finclude/omp_lib.mod
> +lib/gcc/${CONFIG}/${V}/finclude/omp_lib.h
>  lib/gcc/${CONFIG}/${V}/libcaf_single.a
>  lib/gcc/${CONFIG}/${V}/libcaf_single.la
>  lib/libgfortran.a
> 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 19 Jun 2020 18:36:56 -0000
> @@ -13,5 +13,9 @@ 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}
> +lib/libgomp.a
> +lib/libgomp.spec
>  %%ITM%%
>  %%QUADMATH%%
> 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 19 Jun 2020 18:36:56 -0000
> @@ -29,6 +29,7 @@ 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/stdalign.h
>  lib/gcc/${CONFIG}/${V}/include/stdatomic.h
>  lib/gcc/${CONFIG}/${V}/include/stdfix.h
>

Reply via email to