From owner-svn-src-all@freebsd.org Wed Jul 29 04:36:46 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6282337DCAC; Wed, 29 Jul 2020 04:36:46 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BGgjp2328z4Hpx; Wed, 29 Jul 2020 04:36:46 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 293721A3C2; Wed, 29 Jul 2020 04:36:46 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06T4akP8093973; Wed, 29 Jul 2020 04:36:46 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06T4akES093972; Wed, 29 Jul 2020 04:36:46 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <202007290436.06T4akES093972@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Wed, 29 Jul 2020 04:36:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r363658 - stable/12 X-SVN-Group: stable-12 X-SVN-Commit-Author: truckman X-SVN-Commit-Paths: stable/12 X-SVN-Commit-Revision: 363658 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jul 2020 04:36:46 -0000 Author: truckman Date: Wed Jul 29 04:36:45 2020 New Revision: 363658 URL: https://svnweb.freebsd.org/changeset/base/363658 Log: Make lex a bootstrap tool when cross-building on recent 13-CURRENT if binutils/ld is going to be built. The latter is no longer true by default. 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/12 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. This is similar to the stable/11 change in r363653, but in stable/12 we only need to build lex as a bootstrap tool if binutils/ld is going to be built. Modified: stable/12/Makefile.inc1 Modified: stable/12/Makefile.inc1 ============================================================================== --- stable/12/Makefile.inc1 Wed Jul 29 00:34:24 2020 (r363657) +++ stable/12/Makefile.inc1 Wed Jul 29 04:36:45 2020 (r363658) @@ -2066,10 +2066,15 @@ _vtfontcvt= usr.bin/vtfontcvt .if ${BOOTSTRAPPING} < 1000033 _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 && ${MK_LLD_IS_LD} == "no") +_lex= usr.bin/lex .endif # r245440 mtree -N support added