FreeBSD Bugzilla – Attachment 219622 Details for
Bug 246700
[exp-run] Update GCC_DEFAULT from 9 to 10
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch to various port Makefiles
gcc10.diff.out.20201113 (text/plain), 23.79 KB, created by
Mark Linimon
on 2020-11-13 04:48:32 UTC
(
hide
)
Description:
patch to various port Makefiles
Filename:
MIME Type:
Creator:
Mark Linimon
Created:
2020-11-13 04:48:32 UTC
Size:
23.79 KB
patch
obsolete
>Index: Mk/bsd.default-versions.mk >=================================================================== >--- Mk/bsd.default-versions.mk (revision 552706) >+++ Mk/bsd.default-versions.mk (working copy) >@@ -51,7 +51,7 @@ > .if ${ARCH} == "powerpcspe" > GCC_DEFAULT?= 8 > .else >-GCC_DEFAULT?= 9 >+GCC_DEFAULT?= 10 > .endif > # Possible values: 7, 8, 9, agpl > GHOSTSCRIPT_DEFAULT?= agpl >Index: audio/lsp-plugins-lv2/Makefile >=================================================================== >--- audio/lsp-plugins-lv2/Makefile (revision 552706) >+++ audio/lsp-plugins-lv2/Makefile (working copy) >@@ -22,7 +22,9 @@ > USES= compiler:c11 gmake gl gnome iconv:wchar_t pkgconfig xorg > USE_GITHUB= yes > GH_ACCOUNT= sadko4u >-USE_GCC= any # clang breaks: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=232911 >+# changed from yes to 9 due to: >+# types.h:95:37: error: 'asm' operand has impossible constraints >+USE_GCC= 9 # clang breaks: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=232911 > USE_GNOME= cairo > USE_XORG= x11 > USE_GL= gl >Index: biology/molden/Makefile >=================================================================== >--- biology/molden/Makefile (revision 552706) >+++ biology/molden/Makefile (working copy) >@@ -39,6 +39,13 @@ > OPTIONS_DEFINE= DATA DOCS > OPTIONS_DEFAULT= DATA > >+.include <bsd.port.pre.mk> >+ >+.if ${GCC_DEFAULT} >= 10 >+# workaround for Type mismatch between actual argument at (1) and actual argument at (2) (REAL(8)/REAL(4)). >+FFLAGS+= -fallow-argument-mismatch >+.endif >+ > post-patch: > @${REINPLACE_CMD} -e \ > 's|^CC |#CC | ; \ >Index: biology/ncbi-blast+/Makefile >=================================================================== >--- biology/ncbi-blast+/Makefile (revision 552706) >+++ biology/ncbi-blast+/Makefile (working copy) >@@ -58,6 +58,10 @@ > USE_GCC= yes > .endif > >+.if ${GCC_DEFAULT} >= 10 >+BROKEN= fails to configure with GCC 10: configure: error: Do not know how to parse GCC version number 10.2.0 >+.endif >+ > post-install: > @${RM} ${STAGEDIR}${PREFIX}/include/ncbi-tools++/*/*/.cvsignore.extra > @${RM} -rf ${STAGEDIR}${PREFIX}/lib/X11 >Index: cad/calculix-ccx/Makefile >=================================================================== >--- cad/calculix-ccx/Makefile (revision 552706) >+++ cad/calculix-ccx/Makefile (working copy) >@@ -55,6 +55,11 @@ > 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}+ ; \ >Index: comms/wsjtx/Makefile >=================================================================== >--- comms/wsjtx/Makefile (revision 552706) >+++ comms/wsjtx/Makefile (working copy) >@@ -36,6 +36,13 @@ > > _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 >Index: games/libretro-paralleln64/Makefile >=================================================================== >--- games/libretro-paralleln64/Makefile (revision 552706) >+++ games/libretro-paralleln64/Makefile (working copy) >@@ -30,8 +30,14 @@ > > 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> >Index: math/blacs/Makefile >=================================================================== >--- math/blacs/Makefile (revision 552706) >+++ math/blacs/Makefile (working copy) >@@ -35,6 +35,11 @@ > .include <bsd.port.pre.mk> > > F77EXTRAFLAGS= #-w -fno-globals -fugly-complex >+.if ${GCC_DEFAULT} >= 10 >+# workaround for Rank mismatch between actual argument at (1) and actual argument at (2) (scalar and rank-1) >+F77EXTRAFLAGS+= -fallow-argument-mismatch >+.endif >+ > DEBUG_LEVEL= 0 > > .if ${ARCH} == "sparc64" || ${ARCH} == "amd64" >Index: math/coinmumps/Makefile >=================================================================== >--- math/coinmumps/Makefile (revision 554449) >+++ math/coinmumps/Makefile (working copy) >@@ -29,6 +29,14 @@ > > MUMPS_VERSION= 4.10.0 > >+.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-1) >+# in theory, this should set FCFLAGS, but the port does not conform >+FFLAGS+= -fallow-argument-mismatch >+.endif >+ > post-extract: > @${RLN} ${WRKDIR}/MUMPS_${MUMPS_VERSION} ${WRKSRC}/MUMPS > >@@ -38,4 +46,4 @@ > ${PATCH} -p0 < mumps_mpi.patch && \ > ${MV} MUMPS/libseq/mpi.h MUMPS/libseq/mumps_mpi.h > >-.include <bsd.port.mk> >+.include <bsd.port.post.mk> >Index: math/dbcsr/Makefile >=================================================================== >--- math/dbcsr/Makefile (revision 552706) >+++ math/dbcsr/Makefile (working copy) >@@ -39,6 +39,12 @@ > C_API_DESC= Build the C API library > C_API_CMAKE_BOOL= WITH_C_API > >+.include <bsd.port.pre.mk> >+ >+.if ${GCC_DEFAULT} >= 10 >+BROKEN= fails to build with GCC 10: Error: Rank mismatch between actual argument at (1) and actual argument at (2) (scalar and rank-1) >+.endif >+ > do-test: # tests are broken: https://github.com/cp2k/dbcsr/issues/150 > @cd ${BUILD_WRKSRC} && \ > ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \ >Index: math/gotoblas/Makefile >=================================================================== >--- math/gotoblas/Makefile (revision 552706) >+++ math/gotoblas/Makefile (working copy) >@@ -78,6 +78,10 @@ > GOTOFLAGS+= USE_OPENMP=1 > .endif > >+.if ${GCC_DEFAULT} >= 10 >+BROKEN= fails to build with GCC 10: Type mismatch between actual argument at (1) and actual argument at (2) (REAL(8)/INTEGER(4)). >+.endif >+ > #.if ${PORT_OPTIONS:MQUAD_PRECISION} > #BROKEN= WITH_QUAD_PRECISION is broken; please disable this option > #GOTOFLAGS+= QUAD_PRECISION=1 >Index: math/hs-penrose/Makefile >=================================================================== >--- math/hs-penrose/Makefile (revision 552706) >+++ math/hs-penrose/Makefile (working copy) >@@ -16,7 +16,7 @@ > > LIB_DEPENDS= libgfortran.so:lang/gcc${GCC_DEFAULT} > >-USES= blaslapack cabal >+USES= blaslapack cabal fortran > USE_GITHUB= yes > USE_CABAL= MonadRandom-0.5.1.2 \ > SHA-1.6.4.4 \ >@@ -135,4 +135,10 @@ > x509-1.7.5_1 \ > zlib-0.6.2.1_1 > >-.include <bsd.port.mk> >+.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.post.mk> >Index: math/ipopt/Makefile >=================================================================== >--- math/ipopt/Makefile (revision 552706) >+++ math/ipopt/Makefile (working copy) >@@ -41,6 +41,13 @@ > > PORTDOCS= * > >+.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-1) >+FFLAGS+= -fallow-argument-mismatch >+.endif >+ > post-extract: > @(${ECHO} "Extracting Metis and Mumps ThirdParty libraries ..." ) > @(cd ${WRKSRC}/ThirdParty/Metis && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/metis-4.0.3.tar.gz ${EXTRACT_AFTER_ARGS}); >Index: math/mumps/Makefile >=================================================================== >--- math/mumps/Makefile (revision 552706) >+++ math/mumps/Makefile (working copy) >@@ -44,6 +44,11 @@ > .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 >Index: math/mumps4/Makefile >=================================================================== >--- math/mumps4/Makefile (revision 552706) >+++ math/mumps4/Makefile (working copy) >@@ -61,6 +61,11 @@ > #LAPACKLIB= -llapack > .endif > >+.if ${GCC_DEFAULT} >= 10 >+# workaround for Type mismatch in argument 's' at (1); passed INTEGER(4) to LOGICAL(4) >+FCFLAGS+= -fallow-argument-mismatch >+.endif >+ > pre-configure: > ${INSTALL_DATA} ${WRKSRC}/Make.inc/Makefile.inc.generic.SEQ \ > ${WRKSRC}/Makefile.inc >Index: math/octave-forge-optiminterp/Makefile >=================================================================== >--- math/octave-forge-optiminterp/Makefile (revision 552706) >+++ math/octave-forge-optiminterp/Makefile (working copy) >@@ -24,8 +24,16 @@ > > 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> >Index: math/scalapack/Makefile >=================================================================== >--- math/scalapack/Makefile (revision 552706) >+++ math/scalapack/Makefile (working copy) >@@ -75,6 +75,11 @@ > FFLAGS+= ${FPIC} > SVERSION= 2 > >+.if ${GCC_DEFAULT} >= 10 >+# workaround for Rank mismatch between actual argument at (1) and actual argument at (2) (scalar and rank-1) >+FFLAGS+= -fallow-argument-mismatch >+.endif >+ > .if defined(WITH_OPTIMIZED_FLAGS) > .if ${ARCH} == "amd64" > FFLAGS+= -pipe -O3 -ffast-math -funroll-all-loops -fpeel-loops -ftracer -funswitch-loops -funit-at-a-time >Index: math/scilab/Makefile >=================================================================== >--- math/scilab/Makefile (revision 552706) >+++ math/scilab/Makefile (working copy) >@@ -130,6 +130,13 @@ > 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 >Index: math/sdpa/Makefile >=================================================================== >--- math/sdpa/Makefile (revision 552706) >+++ math/sdpa/Makefile (working copy) >@@ -40,6 +40,13 @@ > > MANUALFILE= sdpa.7.1.1.manual.20080618.pdf > >+.include <bsd.port.pre.mk> >+ >+.if ${GCC_DEFAULT} >= 10 >+# workaround for Type mismatch in argument 's' at (1); passed INTEGER(4) to LOGICAL(4) >+CONFIGURE_ARGS+= FCFLAGS=-fallow-argument-mismatch >+.endif >+ > post-extract: > @(cd ${DISTDIR}/${DIST_SUBDIR} && ${PAX} -rw \ > mumps_4.10.0.dfsg.orig.tar.gz ${WRKSRC}/mumps) >@@ -62,4 +69,4 @@ > @${MKDIR} ${STAGEDIR}${DOCSDIR} > ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${MANUALFILE} ${STAGEDIR}${DOCSDIR} > >-.include <bsd.port.mk> >+.include <bsd.port.post.mk> >Index: net/iaxmodem/Makefile >=================================================================== >--- net/iaxmodem/Makefile (revision 552706) >+++ net/iaxmodem/Makefile (working copy) >@@ -31,7 +31,7 @@ > > .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: >Index: science/berkeleygw/Makefile >=================================================================== >--- science/berkeleygw/Makefile (revision 552706) >+++ science/berkeleygw/Makefile (working copy) >@@ -28,9 +28,15 @@ > > PORTEXAMPLES= * > >+.include <bsd.port.pre.mk> >+ >+.if ${ARCH} == i386 && ${GCC_DEFAULT} >= 10 >+BROKEN= f951: internal compiler error: Segmentation fault >+.endif >+ > post-patch: > @${LN} -s ${WRKSRC}/config/generic.serial.freebsd.mk ${WRKSRC}/arch.mk > @${LN} -s ${WRKSRC}/flavor_real.mk ${WRKSRC}/flavor.mk > @${FIND} ${WRKSRC} -name "script*" -o -name "*.scr" | ${XARGS} ${REINPLACE_CMD} -i '' 's|#! */bin/bash.*|#!/bin/sh|' > >-.include <bsd.port.mk> >+.include <bsd.port.post.mk> >Index: science/cp2k/Makefile >=================================================================== >--- science/cp2k/Makefile (revision 552706) >+++ science/cp2k/Makefile (working copy) >@@ -66,6 +66,10 @@ > 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-* > >Index: science/dalton/Makefile >=================================================================== >--- science/dalton/Makefile (revision 552706) >+++ science/dalton/Makefile (working copy) >@@ -29,6 +29,12 @@ > > BINARY_ALIAS= python=${PYTHON_CMD} > >+.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) (REAL(8)/INTEGER(4)). >+.endif >+ > post-install: > @${MV} ${STAGEDIR}${PREFIX}/${PORTNAME} ${STAGEDIR}${DATADIR} > @${REINPLACE_CMD} -i '' 's|%%SCRIPT_DIR%%|${DATADIR}|; s|%%PREFIX%%|${PREFIX}|' ${STAGEDIR}${DATADIR}/${PORTNAME} >@@ -35,4 +41,4 @@ > @${MV} ${STAGEDIR}${DATADIR}/${PORTNAME}* ${STAGEDIR}${PREFIX}/bin/ > @cd ${STAGEDIR}${DATADIR} && ${RM} -r tools/CMakeFiles tools/Makefile tools/cmake_install.cmake > >-.include <bsd.port.mk> >+.include <bsd.port.post.mk> >Index: science/dftbplus/Makefile >=================================================================== >--- science/dftbplus/Makefile (revision 552706) >+++ science/dftbplus/Makefile (working copy) >@@ -62,6 +62,14 @@ > > MAKE_JOBS_UNSAFE= yes # race conditions when some options are ON > >+.include <bsd.port.pre.mk> >+ >+.if ${GCC_DEFAULT} >= 10 >+# workaround for Type mismatch between actual argument at (1) and actual argument at (2) (COMPLEX(8)/CHARACTER(*)). >+# in theory, this should set FCFLAGS, but the port does not conform >+FFLAGS+= -fallow-argument-mismatch >+.endif >+ > post-extract: > @${RM} ${WRKSRC}/external/scalapackfx/origin/test/psyr_result.dat.orig > @cd ${WRKSRC} && ${CP} sys/make.x86_64-linux-gnu make.arch >@@ -69,4 +77,4 @@ > post-install: > @cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} dftb+ modes waveplot > >-.include <bsd.port.mk> >+.include <bsd.port.post.mk> >Index: science/dlpoly-classic/Makefile >=================================================================== >--- science/dlpoly-classic/Makefile (revision 552706) >+++ science/dlpoly-classic/Makefile (working copy) >@@ -36,6 +36,12 @@ > GUI_PLIST_FILES= bin/dlpoly-gui \ > ${DATADIR_REL}/GUI.jar > >+.include <bsd.port.options.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(4)/REAL(4)). >+.endif >+ > post-patch: > ${CP} ${WRKSRC}/build/MakePAR ${WRKSRC}/build/MakeSEQ ${BUILD_WRKSRC} > ${REINPLACE_CMD} 's|gfortran|${FC}|g' ${BUILD_WRKSRC}/MakeSEQ >@@ -54,8 +60,6 @@ > ${CP} -f MakePAR Makefile && \ > ${MAKE} gfortran) > >-.include <bsd.port.options.mk> >- > do-install: > ${INSTALL_PROGRAM} ${WRKSRC}/execute/dlpoly-classic ${STAGEDIR}${PREFIX}/bin > ${INSTALL_PROGRAM} ${WRKSRC}/execute/dlpoly-classic-mpi ${STAGEDIR}${PREFIX}/bin >Index: science/elk/Makefile >=================================================================== >--- science/elk/Makefile (revision 552706) >+++ science/elk/Makefile (working copy) >@@ -39,8 +39,17 @@ > > PLIST_FILES= bin/${PORTNAME} > >+.include <bsd.port.pre.mk> >+ >+.if ${GCC_DEFAULT} >= 10 >+# workaround for Type mismatch in argument 'cc' at (1); passed COMPLEX(8) to REAL(8) >+FCFLAGS+= -fallow-argument-mismatch >+.endif >+ > post-patch: >- @${SED} 's|%%GMAKE%%|${GMAKE}|; s|%%FC%%|${FC}|; s|%%OPENMP_FLAGS%%|${OPENMP_FLAGS}|' \ >+ @${SED} 's|%%GMAKE%%|${GMAKE}|; s|%%FC%%|${FC}|; \ >+ s|%%FCFLAGS%%|${FCFLAGS}|; \ >+ s|%%OPENMP_FLAGS%%|${OPENMP_FLAGS}|' \ > < ${FILESDIR}/make.inc.in \ > > ${WRKSRC}/make.inc > >@@ -58,4 +67,4 @@ > do-test: > @cd ${WRKSRC}/tests && ./tests.sh > >-.include <bsd.port.mk> >+.include <bsd.port.post.mk> >Index: science/elk/files/make.inc.in >=================================================================== >--- science/elk/files/make.inc.in (revision 552706) >+++ science/elk/files/make.inc.in (working copy) >@@ -1,7 +1,7 @@ > > MAKE = %%GMAKE%% > F90 = %%FC%% >-F90_OPTS = -O3 -ffast-math -funroll-loops %%OPENMP_FLAGS%% >+F90_OPTS = -O3 -ffast-math -funroll-loops %%OPENMP_FLAGS%% %%FCFLAGS%% > F77 = %%FC%% > F77_OPTS = -O3 -ffast-math -funroll-loops %%OPENMP_FLAGS%% > AR = ar >Index: science/elmerfem/Makefile >=================================================================== >--- science/elmerfem/Makefile (revision 552706) >+++ science/elmerfem/Makefile (working copy) >@@ -73,6 +73,12 @@ > 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>,' \ >Index: science/getdp/Makefile >=================================================================== >--- science/getdp/Makefile (revision 552706) >+++ science/getdp/Makefile (working copy) >@@ -20,6 +20,13 @@ > > 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 > >Index: science/hdf/Makefile >=================================================================== >--- science/hdf/Makefile (revision 552706) >+++ science/hdf/Makefile (working copy) >@@ -31,6 +31,14 @@ > > OPTIONS_DEFINE= EXAMPLES > >+.include <bsd.port.pre.mk> >+ >+.if ${GCC_DEFAULT} >= 10 >+# workaround for Type mismatch between actual argument at (1) and actual argument at (2) (CHARACTER(0)/INTEGER(4)). >+# in theory, this should set FCFLAGS, but the port does not conform >+FFLAGS+= -fallow-argument-mismatch >+.endif >+ > post-patch: > @${REINPLACE_CMD} -e '/PROD_/ s|=.*|=""|' ${WRKSRC}/config/freebsd > @${REINPLACE_CMD} -e 's/ || (__APPLE__.*//' \ >@@ -42,4 +50,4 @@ > ${INSTALL_MAN} ${WRKSRC}/man/gr_chunk.3 \ > ${STAGEDIR}${MAN3PREFIX}/man/man3 > >-.include <bsd.port.mk> >+.include <bsd.port.post.mk> >Index: science/latte/Makefile >=================================================================== >--- science/latte/Makefile (revision 552706) >+++ science/latte/Makefile (working copy) >@@ -40,4 +40,12 @@ > > CONFLICTS_INSTALL= latte-integrale > >+.include <bsd.port.pre.mk> >+ >+.if ${GCC_DEFAULT} >= 10 >+# workaround for Type mismatch between actual argument at (1) and actual argument at (2) (COMPLEX(8)/REAL(8)). >+# in theory, this should set FCFLAGS, but the port does not conform >+FFLAGS+= -fallow-argument-mismatch >+.endif >+ > .include <bsd.port.mk> >Index: science/libgridxc/Makefile >=================================================================== >--- science/libgridxc/Makefile (revision 552706) >+++ science/libgridxc/Makefile (working copy) >@@ -37,6 +37,12 @@ > 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 \ >Index: science/mbdyn/Makefile >=================================================================== >--- science/mbdyn/Makefile (revision 552706) >+++ science/mbdyn/Makefile (working copy) >@@ -58,9 +58,17 @@ > REFERENCE_CONFIGURE_ON= --with-blas=blas > REFERENCE_USES= blaslapack:netlib > >+.include <bsd.port.pre.mk> >+ >+.if ${GCC_DEFAULT} >= 10 >+# workaround for Type mismatch in argument 't' at (1); passed REAL(4) to INTEGER(4) >+# in theory, this should set FCFLAGS, but the port does not conform >+FFLAGS+= -fallow-argument-mismatch >+.endif >+ > pre-configure: > ${REINPLACE_CMD} -e '/try_lapack_LIBS=/s/-llapack/${LAPACKLIB}/' \ > -e 's/ -lxerbla//; s/-lcholmod/-lcholmod ${BLASLIB} ${LAPACKLIB} -lsuitesparseconfig/' \ > ${WRKSRC}/configure > >-.include <bsd.port.mk> >+.include <bsd.port.post.mk> >Index: science/mdynamix/Makefile >=================================================================== >--- science/mdynamix/Makefile (revision 552706) >+++ science/mdynamix/Makefile (working copy) >@@ -26,4 +26,12 @@ > ${INSTALL_PROGRAM} ${WRKSRC}/md ${STAGEDIR}${PREFIX}/bin > ${INSTALL_PROGRAM} ${WRKSRC}/mdp ${STAGEDIR}${PREFIX}/bin > >+.include <bsd.port.pre.mk> >+ >+.if ${GCC_DEFAULT} >= 10 >+# workaround for Type mismatch between actual argument at (1) and actual argument at (2) (INTEGER(4)/REAL(4)). >+# in theory, this should set FCFLAGS, but the port does not conform >+FFLAGS+= -fallow-argument-mismatch >+.endif >+ > .include <bsd.port.mk> >Index: science/octopus/Makefile >=================================================================== >--- science/octopus/Makefile (revision 552706) >+++ science/octopus/Makefile (working copy) >@@ -41,7 +41,15 @@ > OPTIONS_DEFAULT= OPENMP > OPENMP_CONFIGURE_ENABLE= openmp > >+.include <bsd.port.pre.mk> >+ >+# workaround for: >+# Error: BOZ literal constant at (1) is neither a data-stmt-constant nor an actual argument to INT, REAL, DBLE, or CMPLX intrinsic function [see '-fno-allow-invalid-boz'] >+.if ${GCC_DEFAULT} >= 10 >+FCFLAGS+= -fallow-argument-mismatch -fallow-invalid-boz >+.endif >+ > post-stage: # https://gitlab.com/octopus-code/octopus/issues/108 > @${RM} ${STAGEDIR}${PREFIX}/include/yaml.h > >-.include <bsd.port.mk> >+.include <bsd.port.post.mk> >Index: science/pnetcdf/Makefile >=================================================================== >--- science/pnetcdf/Makefile (revision 552706) >+++ science/pnetcdf/Makefile (working copy) >@@ -37,6 +37,13 @@ > 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 > >Index: science/quantum-espresso/Makefile >=================================================================== >--- science/quantum-espresso/Makefile (revision 552706) >+++ science/quantum-espresso/Makefile (working copy) >@@ -34,6 +34,15 @@ > > MAKE_JOBS_UNSAFE= yes # https://github.com/QEF/q-e/issues/9 > >+.include <bsd.port.pre.mk> >+ >+.if ${GCC_DEFAULT} >= 10 >+# workaround for Error: Rank mismatch between actual argument at (1) >+# and actual argument at (2) (scalar and rank-1) >+# in theory, this should set FCFLAGS, but the port does not conform >+FFLAGS+= -fallow-argument-mismatch >+.endif >+ > post-extract: > @${RM} ${WRKSRC}/archive/lapack-3.6.1.tgz > @cd ${WRKSRC} && ${MKDIR} FoX && ${LN} -s ${LOCALBASE}/include FoX/finclude >Index: science/siesta/Makefile >=================================================================== >--- science/siesta/Makefile (revision 552706) >+++ science/siesta/Makefile (working copy) >@@ -26,6 +26,13 @@ > > PLIST_FILES= bin/${PORTNAME} > >+.include <bsd.port.pre.mk> >+ >+.if ${GCC_DEFAULT} >= 10 >+# workaround for Type mismatch between actual argument at (1) and actual argument at (2) (COMPLEX(8)/REAL(8)). >+FCFLAGS+= -fallow-argument-mismatch >+.endif >+ > pre-configure: > @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SH} ../Src/obj_setup.sh > >@@ -32,4 +39,4 @@ > do-install: > ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin > >-.include <bsd.port.mk> >+.include <bsd.port.post.mk>
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 246700
:
214815
|
218992
|
219622
|
219773
|
220319