Attachment 219773 Details for Bug 246700 – patch to various port Makefiles

[patch] patch to various port Makefiles

gcc10.diff.out.20201117 (text/plain), 11.31 KB, created by Mark Linimon on 2020-11-17 22:06:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Linimon

Created: 2020-11-17 22:06:12 UTC

Size: 11.31 KB

patch

obsolete

>Index: Mk/bsd.default-versions.mk
>===================================================================
>--- Mk/bsd.default-versions.mk	(revision 555008)
>+++ 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: biology/molden/Makefile
>===================================================================
>--- biology/molden/Makefile	(revision 555008)
>+++ 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: cad/calculix-ccx/Makefile
>===================================================================
>--- cad/calculix-ccx/Makefile	(revision 555008)
>+++ 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 555008)
>+++ 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 555008)
>+++ 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 555008)
>+++ 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/gotoblas/Makefile
>===================================================================
>--- math/gotoblas/Makefile	(revision 555008)
>+++ 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/mumps/Makefile
>===================================================================
>--- math/mumps/Makefile	(revision 555008)
>+++ 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 555008)
>+++ 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 555008)
>+++ 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 555008)
>+++ 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 555008)
>+++ math/scilab/Makefile	(working copy)
>@@ -129,6 +129,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 555008)
>+++ 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 555008)
>+++ 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/cp2k/Makefile
>===================================================================
>--- science/cp2k/Makefile	(revision 555008)
>+++ 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/elmerfem/Makefile
>===================================================================
>--- science/elmerfem/Makefile	(revision 555008)
>+++ 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 555008)
>+++ 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 555008)
>+++ 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/libgridxc/Makefile
>===================================================================
>--- science/libgridxc/Makefile	(revision 555008)
>+++ 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/pnetcdf/Makefile
>===================================================================
>--- science/pnetcdf/Makefile	(revision 555008)
>+++ 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
>

Actions: View | Diff

Attachments on bug 246700: 214815 | 218992 | 219622 | 219773 | 220319