Module Name: src Committed By: rin Date: Sat Aug 17 12:36:43 UTC 2024
Modified Files: src/external/mit/xorg/lib/freetype: Makefile Log Message: freetype: ftlzw.c: XXX: Disable stack-protector for GCC/m68k 12.4 Otherwise, __stack_chk_fail() is raised for ft_lzw_check_header(), which crashes `/etc/rc.d/fccache start`. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/external/mit/xorg/lib/freetype/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/mit/xorg/lib/freetype/Makefile diff -u src/external/mit/xorg/lib/freetype/Makefile:1.25 src/external/mit/xorg/lib/freetype/Makefile:1.26 --- src/external/mit/xorg/lib/freetype/Makefile:1.25 Thu Jul 27 21:58:51 2023 +++ src/external/mit/xorg/lib/freetype/Makefile Sat Aug 17 12:36:43 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2023/07/27 21:58:51 christos Exp $ +# $NetBSD: Makefile,v 1.26 2024/08/17 12:36:43 rin Exp $ USE_FORT?= yes # data-driven bugs? @@ -114,6 +114,10 @@ PKGCONFIG= freetype2 PKGDIST.freetype2= ${.CURDIR} PKGCONFIG_VERSION.freetype2= 23:0:17 +.if ${MACHINE_ARCH} == "m68k" && ${HAVE_GCC:U0} == 12 +COPTS.ftlzw.c+= -fno-stack-protector +.endif + .include <bsd.x11.mk> .include <bsd.lib.mk> .include <bsd.subdir.mk>