From owner-svn-src-releng@freebsd.org Wed Apr 29 18:51:35 2020 Return-Path: Delivered-To: svn-src-releng@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 9DA222BEDC3; Wed, 29 Apr 2020 18:51:35 +0000 (UTC) (envelope-from emaste@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) server-signature RSA-PSS (4096 bits) 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 49C7073mNLz4dfJ; Wed, 29 Apr 2020 18:51:35 +0000 (UTC) (envelope-from emaste@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 7C977A1DD; Wed, 29 Apr 2020 18:51:35 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03TIpZTG011741; Wed, 29 Apr 2020 18:51:35 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03TIpZn8011740; Wed, 29 Apr 2020 18:51:35 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202004291851.03TIpZn8011740@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 29 Apr 2020 18:51:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r360473 - releng/12.1/share/mk X-SVN-Group: releng X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: releng/12.1/share/mk X-SVN-Commit-Revision: 360473 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Apr 2020 18:51:35 -0000 Author: emaste Date: Wed Apr 29 18:51:34 2020 New Revision: 360473 URL: https://svnweb.freebsd.org/changeset/base/360473 Log: MF10 r352637,r358076: correct Clang and lld version checks r352637 (mhorne): Allow for compiler versions >= 10 r358076 (dim): Correctly recognize linker versions greater than 10.0. These routines determine the host compiler and linker version, and caused attempts to build 12.1-RELEASE on 13-CURRENT to fail after the latter was updated to Clang 10. We don't guarantee such a build config to work, but it is used by FreeBSD ports build processes. As a result the fixes from stable/12 will be included with the next set of advisories, and are being committed to the branch now to unblock ports builds. PR: 245973 Reported by: sbruno, antoine Approved by: so Errata: EN-20:10.build Sponsored by: The FreeBSD Foundation Modified: releng/12.1/share/mk/bsd.compiler.mk releng/12.1/share/mk/bsd.linker.mk Directory Properties: releng/12.1/ (props changed) Modified: releng/12.1/share/mk/bsd.compiler.mk ============================================================================== --- releng/12.1/share/mk/bsd.compiler.mk Wed Apr 29 17:02:37 2020 (r360472) +++ releng/12.1/share/mk/bsd.compiler.mk Wed Apr 29 18:51:34 2020 (r360473) @@ -168,7 +168,7 @@ ${X_}COMPILER_TYPE:= clang . endif .endif .if !defined(${X_}COMPILER_VERSION) -${X_}COMPILER_VERSION!=echo "${_v:M[1-9].[0-9]*}" | awk -F. '{print $$1 * 10000 + $$2 * 100 + $$3;}' +${X_}COMPILER_VERSION!=echo "${_v:M[1-9]*.[0-9]*}" | awk -F. '{print $$1 * 10000 + $$2 * 100 + $$3;}' .endif .undef _v .endif Modified: releng/12.1/share/mk/bsd.linker.mk ============================================================================== --- releng/12.1/share/mk/bsd.linker.mk Wed Apr 29 17:02:37 2020 (r360472) +++ releng/12.1/share/mk/bsd.linker.mk Wed Apr 29 18:51:34 2020 (r360473) @@ -59,7 +59,7 @@ _ld_version!= (${${ld}} --version || echo none) | sed .if ${_ld_version:[1..2]} == "GNU ld" ${X_}LINKER_TYPE= bfd ${X_}LINKER_FREEBSD_VERSION= 0 -_v= ${_ld_version:M[1-9].[0-9]*:[1]} +_v= ${_ld_version:M[1-9]*.[0-9]*:[1]} .elif ${_ld_version:[1]} == "LLD" ${X_}LINKER_TYPE= lld _v= ${_ld_version:[2]} @@ -71,7 +71,7 @@ ${X_}LINKER_FREEBSD_VERSION!= \ ${X_}LINKER_TYPE= bfd _v= 2.17.50 .endif -${X_}LINKER_VERSION!= echo "${_v:M[1-9].[0-9]*}" | \ +${X_}LINKER_VERSION!= echo "${_v:M[1-9]*.[0-9]*}" | \ awk -F. '{print $$1 * 10000 + $$2 * 100 + $$3;}' .undef _ld_version .undef _v From owner-svn-src-releng@freebsd.org Wed Apr 29 18:55:11 2020 Return-Path: Delivered-To: svn-src-releng@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 610222BF0C5; Wed, 29 Apr 2020 18:55:11 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f172.google.com (mail-il1-f172.google.com [209.85.166.172]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49C74G2dNpz4f5V; Wed, 29 Apr 2020 18:55:10 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f172.google.com with SMTP id s10so3459351iln.11; Wed, 29 Apr 2020 11:55:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=OJ65ETRt2S4wLwUs8cQTfrX8JSNHEPNH5w3ERxlK8cs=; b=pUseBM85IYIH3l82r1cYcJBizqTnqTTLmphwOtTEdh+TVpIPAEvY5KWnGC4iVFOg7C ukKQQWvcPoO50sfnlmLfSjQzZZqcefcoQgkN9BXTgoHbjNoQA9EQT5o/6ZgC5+Kxz72e e43DFmbMFTghh/k5INxhWBUWXqWXrH8sZjx1zJvOgx0DC4RWLIvGvQNbb2AcmKGws83C aScOPsDvKPdulCK4myp7fjOKq5HdDkJARvP8lo/xUciZ3w6ehcS/Uzl4dLvFX3dX1AtN cDn4ZF9UZphwyap5+8pSV9H0AZV+2IautFeRBdrpBX3dSejs5o2emUm6tHGG4cAsQtfW WkhA== X-Gm-Message-State: AGi0PuZ4vFrd5gPZeoYT4lNTGYZVD4Tr1PK+LHg4ft4xg99FW1eNTCFf 9x2XiN4LkdJmxtFTeJnNcKuumAETR8kAuSh3FlQnk/GA X-Google-Smtp-Source: APiQypIY/vVFXl2sJyC7SDahmNAstOpslGRhe91gbacaR7d0y3j15AQ5LvkvugC/b+HaJ9xLC9huAw4+RXxMVxluc3c= X-Received: by 2002:a92:7303:: with SMTP id o3mr32095140ilc.11.1588186508312; Wed, 29 Apr 2020 11:55:08 -0700 (PDT) MIME-Version: 1.0 References: <202004291851.03TIpZn8011740@repo.freebsd.org> In-Reply-To: <202004291851.03TIpZn8011740@repo.freebsd.org> From: Ed Maste Date: Wed, 29 Apr 2020 14:54:55 -0400 Message-ID: Subject: Re: svn commit: r360473 - releng/12.1/share/mk To: src-committers , svn-src-all , svn-src-releng@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 49C74G2dNpz4f5V X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.166.172 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-3.45 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; IP_SCORE(-1.45)[ip: (-6.39), ipnet: 209.85.128.0/17(-0.40), asn: 15169(-0.43), country: US(-0.05)]; RCVD_IN_DNSWL_NONE(0.00)[172.166.85.209.list.dnswl.org : 127.0.5.0]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[172.166.85.209.rep.mailspike.net : 127.0.0.17]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Apr 2020 18:55:11 -0000 On Wed, 29 Apr 2020 at 14:51, Ed Maste wrote: > > Author: emaste > Date: Wed Apr 29 18:51:34 2020 > New Revision: 360473 > URL: https://svnweb.freebsd.org/changeset/base/360473 > > Log: > MF10 r352637,r358076: correct Clang and lld version checks Sigh, should be MF12; merged from stable/12 not 10. From owner-svn-src-releng@freebsd.org Wed Apr 29 18:59:40 2020 Return-Path: Delivered-To: svn-src-releng@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 A61442BF226; Wed, 29 Apr 2020 18:59:40 +0000 (UTC) (envelope-from emaste@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) server-signature RSA-PSS (4096 bits) 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 49C79R65Yqz4fLQ; Wed, 29 Apr 2020 18:59:38 +0000 (UTC) (envelope-from emaste@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 5CD95A26C; Wed, 29 Apr 2020 18:59:38 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03TIxbEN017275; Wed, 29 Apr 2020 18:59:37 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03TIxbg0017274; Wed, 29 Apr 2020 18:59:37 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202004291859.03TIxbg0017274@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 29 Apr 2020 18:59:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r360474 - releng/11.3/share/mk X-SVN-Group: releng X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: releng/11.3/share/mk X-SVN-Commit-Revision: 360474 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Apr 2020 18:59:40 -0000 Author: emaste Date: Wed Apr 29 18:59:37 2020 New Revision: 360474 URL: https://svnweb.freebsd.org/changeset/base/360474 Log: MF11 r352638,r358076: correct Clang and lld version checks r352638 (mhorne): Allow for compiler versions >= 10 r358076 (dim): Correctly recognize linker versions greater than 10.0. These routines determine the host compiler and linker version, and caused attempts to build 12.1-RELEASE on 13-CURRENT to fail after the latter was updated to Clang 10. The host compiler version was also misdetected on 11.3 although it seems not to have caused the same build failure there. We don't guarantee such a build config to work, but it is used by FreeBSD ports build processes. As a result the fixes from stable/11 will be included with the next set of advisories, and are being committed to the releng branch now to unblock ports builds. PR: 245973 Reported by: sbruno, antoine Approved by: so Errata: EN-20:10.build Sponsored by: The FreeBSD Foundation Modified: releng/11.3/share/mk/bsd.compiler.mk releng/11.3/share/mk/bsd.linker.mk Directory Properties: releng/11.3/ (props changed) Modified: releng/11.3/share/mk/bsd.compiler.mk ============================================================================== --- releng/11.3/share/mk/bsd.compiler.mk Wed Apr 29 18:51:34 2020 (r360473) +++ releng/11.3/share/mk/bsd.compiler.mk Wed Apr 29 18:59:37 2020 (r360474) @@ -156,7 +156,7 @@ ${X_}COMPILER_TYPE:= clang . endif .endif .if !defined(${X_}COMPILER_VERSION) -${X_}COMPILER_VERSION!=echo "${_v:M[1-9].[0-9]*}" | awk -F. '{print $$1 * 10000 + $$2 * 100 + $$3;}' +${X_}COMPILER_VERSION!=echo "${_v:M[1-9]*.[0-9]*}" | awk -F. '{print $$1 * 10000 + $$2 * 100 + $$3;}' .endif .undef _v .endif Modified: releng/11.3/share/mk/bsd.linker.mk ============================================================================== --- releng/11.3/share/mk/bsd.linker.mk Wed Apr 29 18:51:34 2020 (r360473) +++ releng/11.3/share/mk/bsd.linker.mk Wed Apr 29 18:59:37 2020 (r360474) @@ -55,7 +55,7 @@ _ld_version!= (${${ld}} --version || echo none) | sed .endif .if ${_ld_version:[1..2]} == "GNU ld" ${X_}LINKER_TYPE= bfd -_v= ${_ld_version:M[1-9].[0-9]*:[1]} +_v= ${_ld_version:M[1-9]*.[0-9]*:[1]} .elif ${_ld_version:[1]} == "LLD" ${X_}LINKER_TYPE= lld _v= ${_ld_version:[2]} @@ -64,7 +64,7 @@ _v= ${_ld_version:[2]} ${X_}LINKER_TYPE= bfd _v= 2.17.50 .endif -${X_}LINKER_VERSION!= echo "${_v:M[1-9].[0-9]*}" | \ +${X_}LINKER_VERSION!= echo "${_v:M[1-9]*.[0-9]*}" | \ awk -F. '{print $$1 * 10000 + $$2 * 100 + $$3;}' .undef _ld_version .undef _v