Date: Wed, 13 Jan 2021 23:03:31 +0000 (UTC) From: Mark Linimon <linimon@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r561520 - in head: Mk cad/calculix-ccx comms/wsjtx databases/mariadb105-server games/libretro-paralleln64 math/hs-penrose math/mumps math/octave-forge-optiminterp math/scilab net/iaxmod... Message-ID: <202101132303.10DN3V1Y065953@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: linimon Date: Wed Jan 13 23:03:31 2021 New Revision: 561520 URL: https://svnweb.freebsd.org/changeset/ports/561520 Log: Update GCC_DEFAULT from 9 to 10. A few (mostly Fortran-based) ports need to be patched because GCC 10 is stricter. A handful of ports need to be restricted to GCC 9 because they fail with 10. 5 ports still fail with GCC 10. However, seeing as this work has been ongoing since 2020-05-24, it is simply time to make the commit and notify the affected maintainers. While here, pet portlint (Makevar order). PR: 246700 Submitted by: gerald Approved by: antoine (after many, many, -exp runs) Modified: head/Mk/bsd.default-versions.mk head/cad/calculix-ccx/Makefile head/comms/wsjtx/Makefile head/databases/mariadb105-server/Makefile head/games/libretro-paralleln64/Makefile head/math/hs-penrose/Makefile head/math/mumps/Makefile head/math/octave-forge-optiminterp/Makefile head/math/scilab/Makefile head/net/iaxmodem/Makefile head/science/cp2k/Makefile head/science/elmerfem/Makefile head/science/getdp/Makefile head/science/libgridxc/Makefile head/science/pnetcdf/Makefile Modified: head/Mk/bsd.default-versions.mk ============================================================================== --- head/Mk/bsd.default-versions.mk Wed Jan 13 23:01:26 2021 (r561519) +++ head/Mk/bsd.default-versions.mk Wed Jan 13 23:03:31 2021 (r561520) @@ -53,7 +53,7 @@ GCC_DEFAULT?= 8 .elif ${ARCH} == "powerpc64le" GCC_DEFAULT?= 10 .else -GCC_DEFAULT?= 9 +GCC_DEFAULT?= 10 .endif # Possible values: 7, 8, 9, agpl GHOSTSCRIPT_DEFAULT?= agpl Modified: head/cad/calculix-ccx/Makefile ============================================================================== --- head/cad/calculix-ccx/Makefile Wed Jan 13 23:01:26 2021 (r561519) +++ head/cad/calculix-ccx/Makefile Wed Jan 13 23:03:31 2021 (r561520) @@ -55,6 +55,11 @@ CFLAGS+= -fpic FFLAGS+= -fpic .endif +.if ${GCC_DEFAULT} >= 10 +# workaround for Missing actual argument for argument '_formal_15' at (1) +FFLAGS+= -fallow-argument-mismatch +.endif + pre-build: @${REINPLACE_CMD} -e 's+%%FC%%+${FC}+g ; s+%%CC%%+${CC}+g ; \ s+%%BLAS_LIBS%%+${BLASLIB}+ ; \ Modified: head/comms/wsjtx/Makefile ============================================================================== --- head/comms/wsjtx/Makefile Wed Jan 13 23:01:26 2021 (r561519) +++ head/comms/wsjtx/Makefile Wed Jan 13 23:03:31 2021 (r561520) @@ -36,6 +36,13 @@ PLIST_SUB+= PORTVERSION="${PORTVERSION}" _PATCHES= wsjtx.patch hamlib.patch +.include <bsd.port.pre.mk> + +.if ${GCC_DEFAULT} >= 10 +# workaround for More actual than formal arguments in procedure call at (1) +FFLAGS+= -fallow-argument-mismatch +.endif + post-patch: . for _patch in ${_PATCHES} # Keep a copy of the blank patch for the post-build target below Modified: head/databases/mariadb105-server/Makefile ============================================================================== --- head/databases/mariadb105-server/Makefile Wed Jan 13 23:01:26 2021 (r561519) +++ head/databases/mariadb105-server/Makefile Wed Jan 13 23:03:31 2021 (r561520) @@ -212,7 +212,7 @@ PLIST_SUB+= WSREP="@comment " .endif .if ${ARCH} == i386 -USE_GCC= yes +USE_GCC= 9 CFLAGS+= -DHAVE_GCC_C11_ATOMICS -latomic -DUSE_NEW_READLINE_INTERFACE CXXFLAGS+= -fpermissive .endif Modified: head/games/libretro-paralleln64/Makefile ============================================================================== --- head/games/libretro-paralleln64/Makefile Wed Jan 13 23:01:26 2021 (r561519) +++ head/games/libretro-paralleln64/Makefile Wed Jan 13 23:03:31 2021 (r561520) @@ -32,8 +32,14 @@ GH_TAGNAME= 29e7f39 PLIST_FILES= lib/libretro/parallel_n64_libretro.so +.include <bsd.port.pre.mk> + +.if ${GCC_DEFAULT} >= 10 +BROKEN= fails to link: ./mupen64plus-core/src/dd/dd_disk.o:(.bss+0xc): multiple definition of `CUR_BLOCK' +.endif + do-install: ${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro; ${INSTALL_LIB} ${WRKSRC}/parallel_n64_libretro.so ${STAGEDIR}/${PREFIX}/lib/libretro; -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/math/hs-penrose/Makefile ============================================================================== --- head/math/hs-penrose/Makefile Wed Jan 13 23:01:26 2021 (r561519) +++ head/math/hs-penrose/Makefile Wed Jan 13 23:03:31 2021 (r561520) @@ -134,4 +134,10 @@ USE_CABAL= MonadRandom-0.5.1.2 \ x509-1.7.5_1 \ zlib-0.6.2.1_1 +.include <bsd.port.pre.mk> + +.if ${GCC_DEFAULT} >= 10 +BROKEN= fails to build with GCC 10: cabal: Missing dependency on a foreign library: Missing (or bad) C library: gfortran +.endif + .include <bsd.port.mk> Modified: head/math/mumps/Makefile ============================================================================== --- head/math/mumps/Makefile Wed Jan 13 23:01:26 2021 (r561519) +++ head/math/mumps/Makefile Wed Jan 13 23:03:31 2021 (r561520) @@ -44,6 +44,11 @@ MAKE_JOBS_UNSAFE=yes .include <bsd.port.pre.mk> .include "${.CURDIR}/../../french/aster/bsd.aster.mk" +.if ${GCC_DEFAULT} >= 10 +# workaround for Type mismatch in argument 's' at (1); passed INTEGER(4) to LOGICAL(4) +FCFLAGS+= -fallow-argument-mismatch +.endif + .ifdef WITH_MPI PKGNAMESUFFIX+= -mpich .endif Modified: head/math/octave-forge-optiminterp/Makefile ============================================================================== --- head/math/octave-forge-optiminterp/Makefile Wed Jan 13 23:01:26 2021 (r561519) +++ head/math/octave-forge-optiminterp/Makefile Wed Jan 13 23:03:31 2021 (r561520) @@ -24,8 +24,16 @@ GNU_CONFIGURE= yes MAKE_ENV+= MKOCTFILE_FORTRAN_90=yes MKOCTFILE=mkoctfile +.include <bsd.port.pre.mk> + +.if ${GCC_DEFAULT} >= 10 +# workaround for Rank mismatch between actual argument at (1) and actual argument at (2) (scalar and rank-2) +# in theory, this should set FCFLAGS, but the port does not conform +FFLAGS+= -fallow-argument-mismatch +.endif + post-build: ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/math/scilab/Makefile ============================================================================== --- head/math/scilab/Makefile Wed Jan 13 23:01:26 2021 (r561519) +++ head/math/scilab/Makefile Wed Jan 13 23:03:31 2021 (r561520) @@ -129,6 +129,13 @@ CONFIGURE_ARGS+= --without-openmp CONFIGURE_ARGS+= --enable-debug .endif +.include <bsd.port.pre.mk> + +.if ${GCC_DEFAULT} >= 10 +# workaround for Rank mismatch between actual argument at (1) and actual argument at (2) (rank-1 and scalar) +FFLAGS+= -fallow-argument-mismatch +.endif + post-patch: @${REINPLACE_CMD} 's,/usr/local,${LOCALBASE},' ${WRKSRC}/etc/librarypath.xml @${REINPLACE_CMD} -e 's, gfortran, ${FC},' ${WRKSRC}/modules/dynamic_link/src/scripts/configure Modified: head/net/iaxmodem/Makefile ============================================================================== --- head/net/iaxmodem/Makefile Wed Jan 13 23:01:26 2021 (r561519) +++ head/net/iaxmodem/Makefile Wed Jan 13 23:03:31 2021 (r561520) @@ -31,7 +31,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES .if ${ARCH} == i386 && ${CHOSEN_COMPILER_TYPE} == clang # gsm0610_rpe.c:81:10: error: invalid operand for instruction -USE_GCC= yes +USE_GCC= 9 .endif post-patch: Modified: head/science/cp2k/Makefile ============================================================================== --- head/science/cp2k/Makefile Wed Jan 13 23:01:26 2021 (r561519) +++ head/science/cp2k/Makefile Wed Jan 13 23:03:31 2021 (r561520) @@ -66,6 +66,10 @@ pre-configure: fi .endif +.if ${GCC_DEFAULT} >= 10 +BROKEN= fails to build with GCC 10: Element of assumed-shape or pointer array as actual argument at (1) cannot correspond to actual argument at (2) +.endif + post-patch: @${REINPLACE_CMD} -i '' 's|LIBS.*=.*|& ${LDFLAGS}|; s|^FCFLAGS.*=.*|& -I${LOCALBASE}/include|; s| -march=native||' ${WRKSRC}/arch/FreeBSD-* Modified: head/science/elmerfem/Makefile ============================================================================== --- head/science/elmerfem/Makefile Wed Jan 13 23:01:26 2021 (r561519) +++ head/science/elmerfem/Makefile Wed Jan 13 23:03:31 2021 (r561520) @@ -74,6 +74,12 @@ FCFLAGS+= -fPIC FFLAGS+= -fPIC .endif +.if ${GCC_DEFAULT} >= 10 +# workaround for Type mismatch between actual argument at (1) and actual argument at (2) (REAL(8)/COMPLEX(8)). +# in theory, this should set FCFLAGS, but the port does not conform +FFLAGS+= -fallow-argument-mismatch +.endif + post-patch: @${RM} -r ${WRKSRC}/elmergrid/src/metis-5.1.0 @${REINPLACE_CMD} -e 's,"metis.*/metis\.h",<metis.h>,' \ Modified: head/science/getdp/Makefile ============================================================================== --- head/science/getdp/Makefile Wed Jan 13 23:01:26 2021 (r561519) +++ head/science/getdp/Makefile Wed Jan 13 23:03:31 2021 (r561520) @@ -20,6 +20,13 @@ USES= fortran tar:tgz cmake OPTIONS_DEFINE= DOCS EXAMPLES +.include <bsd.port.pre.mk> + +.if ${GCC_DEFAULT} >= 10 +# workaround for Rank mismatch in argument 'lines' at (1) (rank-1 and scalar) +FFLAGS+= -fallow-argument-mismatch +.endif + do-test: cd ${WRKSRC}/demos && yes "" | ${STAGEDIR}${PREFIX}/bin/${PORTNAME} magnet.pro -solve MagSta_phi Modified: head/science/libgridxc/Makefile ============================================================================== --- head/science/libgridxc/Makefile Wed Jan 13 23:01:26 2021 (r561519) +++ head/science/libgridxc/Makefile Wed Jan 13 23:03:31 2021 (r561520) @@ -37,6 +37,12 @@ LIBXC_MAKE_ENV= WITH_LIBXC=1 LIBXC_LIB_DEPENDS= libxc.so:science/libxc LIBXC_BROKEN= Fails to build with libxc-5.0.0: https://bugs.launchpad.net/libgridxc/+bug/1899578 +.include <bsd.port.pre.mk> + +.if ${GCC_DEFAULT} >= 10 +BROKEN= fails to build with GCC 10: Type mismatch between actual argument at (1) and actual argument at (2) (INTEGER(8)/INTEGER(4)). +.endif + post-patch: @${MKDIR} ${BUILD_WRKSRC} @${CAT} ${WRKSRC}/../extra/fortran.mk \ Modified: head/science/pnetcdf/Makefile ============================================================================== --- head/science/pnetcdf/Makefile Wed Jan 13 23:01:26 2021 (r561519) +++ head/science/pnetcdf/Makefile Wed Jan 13 23:03:31 2021 (r561520) @@ -25,8 +25,8 @@ CFLAGS+= -fPIC CONFIGURE_ARGS= ac_cv_fc_compiler_nag=no GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes -USE_PERL5= build USES= fortran gmake pathfix perl5 tar:bzip2 +USE_PERL5= build PORTDOCS= COPYRIGHT INSTALL README @@ -36,6 +36,13 @@ OPENMPI_CONFIGURE_ON= --with-mpi=${LOCALBASE}/mpi/open OPENMPI_LIB_DEPENDS= libmpi.so:net/openmpi OPENMPI3_CONFIGURE_ON= --with-mpi=${LOCALBASE}/mpi/openmpi3 OPENMPI3_LIB_DEPENDS= libmpi.so:net/openmpi3 + +.include <bsd.port.pre.mk> + +.if ${GCC_DEFAULT} >= 10 +# workaround for Type mismatch between actual argument at (1) and actual argument at (2) (INTEGER(8)/CHARACTER(*)). +FCFLAGS+= -fallow-argument-mismatch +.endif post-patch: @${REINPLACE_CMD} -e '/$$(INSTALL.*$$(PREFIX)/ s|$$(PREFIX)|$$(DESTDIR)&|' ${WRKSRC}/Makefile.in
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101132303.10DN3V1Y065953>