View | Details | Raw Unified | Return to bug 246700 | Differences between
and this patch

Collapse All | Expand All

(-)Mk/bsd.default-versions.mk (-1 / +1 lines)
Lines 51-57 Link Here
51
.if ${ARCH} == "powerpcspe"
51
.if ${ARCH} == "powerpcspe"
52
GCC_DEFAULT?=		8
52
GCC_DEFAULT?=		8
53
.else
53
.else
54
GCC_DEFAULT?=		9
54
GCC_DEFAULT?=		10
55
.endif
55
.endif
56
# Possible values: 7, 8, 9, agpl
56
# Possible values: 7, 8, 9, agpl
57
GHOSTSCRIPT_DEFAULT?=	agpl
57
GHOSTSCRIPT_DEFAULT?=	agpl
(-)biology/molden/Makefile (+7 lines)
Lines 39-44 Link Here
39
OPTIONS_DEFINE=		DATA DOCS
39
OPTIONS_DEFINE=		DATA DOCS
40
OPTIONS_DEFAULT=	DATA
40
OPTIONS_DEFAULT=	DATA
41
41
42
.include <bsd.port.pre.mk>
43
44
.if ${GCC_DEFAULT} >= 10
45
# workaround for Type mismatch between actual argument at (1) and actual argument at (2) (REAL(8)/REAL(4)).
46
FFLAGS+=	-fallow-argument-mismatch
47
.endif
48
42
post-patch:
49
post-patch:
43
	@${REINPLACE_CMD} -e \
50
	@${REINPLACE_CMD} -e \
44
		's|^CC |#CC | ; \
51
		's|^CC |#CC | ; \
(-)cad/calculix-ccx/Makefile (+5 lines)
Lines 55-60 Link Here
55
FFLAGS+=	-fpic
55
FFLAGS+=	-fpic
56
.endif
56
.endif
57
57
58
.if ${GCC_DEFAULT} >= 10
59
# workaround for Missing actual argument for argument '_formal_15' at (1)
60
FFLAGS+=	-fallow-argument-mismatch
61
.endif
62
58
pre-build:
63
pre-build:
59
	@${REINPLACE_CMD} -e 's+%%FC%%+${FC}+g ; s+%%CC%%+${CC}+g ; \
64
	@${REINPLACE_CMD} -e 's+%%FC%%+${FC}+g ; s+%%CC%%+${CC}+g ; \
60
	s+%%BLAS_LIBS%%+${BLASLIB}+ ; \
65
	s+%%BLAS_LIBS%%+${BLASLIB}+ ; \
(-)comms/wsjtx/Makefile (+7 lines)
Lines 36-41 Link Here
36
36
37
_PATCHES=	wsjtx.patch hamlib.patch
37
_PATCHES=	wsjtx.patch hamlib.patch
38
38
39
.include <bsd.port.pre.mk>
40
41
.if ${GCC_DEFAULT} >= 10
42
# workaround for More actual than formal arguments in procedure call at (1)
43
FFLAGS+=	-fallow-argument-mismatch
44
.endif
45
39
post-patch:
46
post-patch:
40
.  for _patch in ${_PATCHES}
47
.  for _patch in ${_PATCHES}
41
	# Keep a copy of the blank patch for the post-build target below
48
	# Keep a copy of the blank patch for the post-build target below
(-)databases/mariadb105-server/Makefile (-1 / +1 lines)
Lines 212-218 Link Here
212
.endif
212
.endif
213
213
214
.if ${ARCH} == i386
214
.if ${ARCH} == i386
215
USE_GCC=	yes
215
USE_GCC=	9
216
CFLAGS+=	-DHAVE_GCC_C11_ATOMICS -latomic -DUSE_NEW_READLINE_INTERFACE
216
CFLAGS+=	-DHAVE_GCC_C11_ATOMICS -latomic -DUSE_NEW_READLINE_INTERFACE
217
CXXFLAGS+=	-fpermissive
217
CXXFLAGS+=	-fpermissive
218
.endif
218
.endif
(-)games/libretro-paralleln64/Makefile (-1 / +7 lines)
Lines 30-37 Link Here
30
30
31
PLIST_FILES=	lib/libretro/parallel_n64_libretro.so
31
PLIST_FILES=	lib/libretro/parallel_n64_libretro.so
32
32
33
.include <bsd.port.pre.mk>
34
35
.if ${GCC_DEFAULT} >= 10
36
BROKEN=		fails to link: ./mupen64plus-core/src/dd/dd_disk.o:(.bss+0xc): multiple definition of `CUR_BLOCK'
37
.endif
38
33
do-install:
39
do-install:
34
	${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro;
40
	${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro;
35
	${INSTALL_LIB} ${WRKSRC}/parallel_n64_libretro.so ${STAGEDIR}/${PREFIX}/lib/libretro;
41
	${INSTALL_LIB} ${WRKSRC}/parallel_n64_libretro.so ${STAGEDIR}/${PREFIX}/lib/libretro;
36
42
37
.include <bsd.port.mk>
43
.include <bsd.port.post.mk>
(-)math/hs-penrose/Makefile (+6 lines)
Lines 135-138 Link Here
135
		x509-1.7.5_1 \
135
		x509-1.7.5_1 \
136
		zlib-0.6.2.1_1
136
		zlib-0.6.2.1_1
137
137
138
.include <bsd.port.pre.mk>
139
140
.if ${GCC_DEFAULT} >= 10
141
BROKEN=		fails to build with GCC 10: cabal: Missing dependency on a foreign library: Missing (or bad) C library: gfortran
142
.endif
143
138
.include <bsd.port.mk>
144
.include <bsd.port.mk>
(-)math/mumps/Makefile (+5 lines)
Lines 43-48 Link Here
43
.include <bsd.port.pre.mk>
43
.include <bsd.port.pre.mk>
44
.include "${.CURDIR}/../../french/aster/bsd.aster.mk"
44
.include "${.CURDIR}/../../french/aster/bsd.aster.mk"
45
45
46
.if ${GCC_DEFAULT} >= 10
47
# workaround for Type mismatch in argument 's' at (1); passed INTEGER(4) to LOGICAL(4)
48
FCFLAGS+=	-fallow-argument-mismatch
49
.endif
50
46
.ifdef WITH_MPI
51
.ifdef WITH_MPI
47
PKGNAMESUFFIX+=		-mpich
52
PKGNAMESUFFIX+=		-mpich
48
.endif
53
.endif
(-)math/octave-forge-optiminterp/Makefile (-1 / +9 lines)
Lines 24-31 Link Here
24
24
25
MAKE_ENV+=	MKOCTFILE_FORTRAN_90=yes MKOCTFILE=mkoctfile
25
MAKE_ENV+=	MKOCTFILE_FORTRAN_90=yes MKOCTFILE=mkoctfile
26
26
27
.include <bsd.port.pre.mk>
28
29
.if ${GCC_DEFAULT} >= 10
30
# workaround for Rank mismatch between actual argument at (1) and actual argument at (2) (scalar and rank-2)
31
# in theory, this should set FCFLAGS, but the port does not conform
32
FFLAGS+=	-fallow-argument-mismatch
33
.endif
34
27
post-build:
35
post-build:
28
	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
36
	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
29
	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
37
	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
30
38
31
.include <bsd.port.mk>
39
.include <bsd.port.post.mk>
(-)math/scilab/Makefile (+7 lines)
Lines 129-134 Link Here
129
CONFIGURE_ARGS+=	--enable-debug
129
CONFIGURE_ARGS+=	--enable-debug
130
.endif
130
.endif
131
131
132
.include <bsd.port.pre.mk>
133
134
.if ${GCC_DEFAULT} >= 10
135
# workaround for Rank mismatch between actual argument at (1) and actual argument at (2) (rank-1 and scalar)
136
FFLAGS+=	-fallow-argument-mismatch
137
.endif
138
132
post-patch:
139
post-patch:
133
	@${REINPLACE_CMD} 's,/usr/local,${LOCALBASE},' ${WRKSRC}/etc/librarypath.xml
140
	@${REINPLACE_CMD} 's,/usr/local,${LOCALBASE},' ${WRKSRC}/etc/librarypath.xml
134
	@${REINPLACE_CMD} -e 's, gfortran, ${FC},' ${WRKSRC}/modules/dynamic_link/src/scripts/configure
141
	@${REINPLACE_CMD} -e 's, gfortran, ${FC},' ${WRKSRC}/modules/dynamic_link/src/scripts/configure
(-)net/iaxmodem/Makefile (-1 / +1 lines)
Lines 31-37 Link Here
31
31
32
.if ${ARCH} == i386 && ${CHOSEN_COMPILER_TYPE} == clang
32
.if ${ARCH} == i386 && ${CHOSEN_COMPILER_TYPE} == clang
33
# gsm0610_rpe.c:81:10: error: invalid operand for instruction
33
# gsm0610_rpe.c:81:10: error: invalid operand for instruction
34
USE_GCC=	yes
34
USE_GCC=	9
35
.endif
35
.endif
36
36
37
post-patch:
37
post-patch:
(-)science/cp2k/Makefile (+4 lines)
Lines 66-71 Link Here
66
	fi
66
	fi
67
.endif
67
.endif
68
68
69
.if ${GCC_DEFAULT} >= 10
70
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)
71
.endif
72
69
post-patch:
73
post-patch:
70
	@${REINPLACE_CMD} -i '' 's|LIBS.*=.*|& ${LDFLAGS}|; s|^FCFLAGS.*=.*|& -I${LOCALBASE}/include|; s| -march=native||' ${WRKSRC}/arch/FreeBSD-*
74
	@${REINPLACE_CMD} -i '' 's|LIBS.*=.*|& ${LDFLAGS}|; s|^FCFLAGS.*=.*|& -I${LOCALBASE}/include|; s| -march=native||' ${WRKSRC}/arch/FreeBSD-*
71
75
(-)science/elmerfem/Makefile (+6 lines)
Lines 74-79 Link Here
74
FFLAGS+=	-fPIC
74
FFLAGS+=	-fPIC
75
.endif
75
.endif
76
76
77
.if ${GCC_DEFAULT} >= 10
78
# workaround for Type mismatch between actual argument at (1) and actual argument at (2) (REAL(8)/COMPLEX(8)).
79
# in theory, this should set FCFLAGS, but the port does not conform
80
FFLAGS+=	-fallow-argument-mismatch
81
.endif
82
77
post-patch:
83
post-patch:
78
	@${RM} -r ${WRKSRC}/elmergrid/src/metis-5.1.0
84
	@${RM} -r ${WRKSRC}/elmergrid/src/metis-5.1.0
79
	@${REINPLACE_CMD} -e 's,"metis.*/metis\.h",<metis.h>,' \
85
	@${REINPLACE_CMD} -e 's,"metis.*/metis\.h",<metis.h>,' \
(-)science/getdp/Makefile (+7 lines)
Lines 20-25 Link Here
20
20
21
OPTIONS_DEFINE=	DOCS EXAMPLES
21
OPTIONS_DEFINE=	DOCS EXAMPLES
22
22
23
.include <bsd.port.pre.mk>
24
25
.if ${GCC_DEFAULT} >= 10
26
# workaround for Rank mismatch in argument 'lines' at (1) (rank-1 and scalar)
27
FFLAGS+=	-fallow-argument-mismatch
28
.endif
29
23
do-test:
30
do-test:
24
	cd ${WRKSRC}/demos && yes "" | ${STAGEDIR}${PREFIX}/bin/${PORTNAME} magnet.pro -solve MagSta_phi
31
	cd ${WRKSRC}/demos && yes "" | ${STAGEDIR}${PREFIX}/bin/${PORTNAME} magnet.pro -solve MagSta_phi
25
32
(-)science/libgridxc/Makefile (+6 lines)
Lines 37-42 Link Here
37
LIBXC_LIB_DEPENDS=	libxc.so:science/libxc
37
LIBXC_LIB_DEPENDS=	libxc.so:science/libxc
38
LIBXC_BROKEN=		Fails to build with libxc-5.0.0: https://bugs.launchpad.net/libgridxc/+bug/1899578
38
LIBXC_BROKEN=		Fails to build with libxc-5.0.0: https://bugs.launchpad.net/libgridxc/+bug/1899578
39
39
40
.include <bsd.port.pre.mk>
41
42
.if ${GCC_DEFAULT} >= 10
43
BROKEN=		fails to build with GCC 10: Type mismatch between actual argument at (1) and actual argument at (2) (INTEGER(8)/INTEGER(4)).
44
.endif
45
40
post-patch:
46
post-patch:
41
	@${MKDIR} ${BUILD_WRKSRC}
47
	@${MKDIR} ${BUILD_WRKSRC}
42
	@${CAT} ${WRKSRC}/../extra/fortran.mk \
48
	@${CAT} ${WRKSRC}/../extra/fortran.mk \
(-)science/pnetcdf/Makefile (+7 lines)
Lines 37-42 Link Here
37
OPENMPI3_CONFIGURE_ON=	--with-mpi=${LOCALBASE}/mpi/openmpi3
37
OPENMPI3_CONFIGURE_ON=	--with-mpi=${LOCALBASE}/mpi/openmpi3
38
OPENMPI3_LIB_DEPENDS=	libmpi.so:net/openmpi3
38
OPENMPI3_LIB_DEPENDS=	libmpi.so:net/openmpi3
39
39
40
.include <bsd.port.pre.mk>
41
42
.if ${GCC_DEFAULT} >= 10
43
# workaround for Type mismatch between actual argument at (1) and actual argument at (2) (INTEGER(8)/CHARACTER(*)).
44
FCFLAGS+=	-fallow-argument-mismatch
45
.endif
46
40
post-patch:
47
post-patch:
41
	@${REINPLACE_CMD} -e '/$$(INSTALL.*$$(PREFIX)/ s|$$(PREFIX)|$$(DESTDIR)&|' ${WRKSRC}/Makefile.in
48
	@${REINPLACE_CMD} -e '/$$(INSTALL.*$$(PREFIX)/ s|$$(PREFIX)|$$(DESTDIR)&|' ${WRKSRC}/Makefile.in
42
49

Return to bug 246700