Date: Tue, 28 Jul 2020 19:35:25 +0000 (UTC) From: Don Lewis <truckman@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r363653 - stable/11 Message-ID: <202007281935.06SJZPbm060356@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: truckman Date: Tue Jul 28 19:35:24 2020 New Revision: 363653 URL: https://svnweb.freebsd.org/changeset/base/363653 Log: Make lex a bootstrap tool when cross-building on recent 13-CURRENT. The import of flex 2.6.4 into -CURRENT changed the type of yy_n_chars in the lex skeleton from yy_size_t to int, which breaks the build of binutils/ld when using the host copy of lex. ldlex.c:3216:3: error: incompatible pointer types passing 'int *' to parameter of type 'yy_size_t *' (aka 'unsigned long *') [-Werror,-Wincompatible-pointer-types] ...YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This is a direct commit to stable/11 since binutils/ld has been removed from -CURRENT, and it would require a different fix there since the bootstrap tool version of lex would also cause breakage. Modified: stable/11/Makefile.inc1 Modified: stable/11/Makefile.inc1 ============================================================================== --- stable/11/Makefile.inc1 Tue Jul 28 17:09:15 2020 (r363652) +++ stable/11/Makefile.inc1 Tue Jul 28 19:35:24 2020 (r363653) @@ -1724,10 +1724,14 @@ _vtfontcvt= usr.bin/vtfontcvt .if ${BOOTSTRAPPING} < 1000033 _libopenbsd= lib/libopenbsd _m4= usr.bin/m4 -_lex= usr.bin/lex ${_bt}-usr.bin/m4: ${_bt}-lib/libopenbsd ${_bt}-usr.bin/lex: ${_bt}-usr.bin/m4 +.endif + +# flex 2.6.4 introduced in 13-CURRRENT r362333 breaks binutils/ld build +.if ${BOOTSTRAPPING} < 1000033 || ${BOOTSTRAPPING} > 1300098 +_lex= usr.bin/lex .endif # r245440 mtree -N support added
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007281935.06SJZPbm060356>