From nobody Fri Aug 16 05:13:03 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WlVW351P7z5S7pm; Fri, 16 Aug 2024 05:13:03 +0000 (UTC) (envelope-from git@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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WlVW348XWz4sWT; Fri, 16 Aug 2024 05:13:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723785183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nYqjSF9u8z42nX0DKb44GwX9FnICci375XLCTZNvO2U=; b=IGJX+vDW9WfDS+Uq2P+b8Kx99vMHrewqATod7Yh/e98dKtNocORNjUwVDvtXqBqgEa8Iis z6ckHA3Hg1ACrC3PRnNphl7YM5SZihMKVSVcA5iNm5G6Zpm5TZb7NFWJJZ05mctTZaDa1Y avwy3h8bWhxlgEFg1kE0rQM0ee5UIUKaNc1EZll6i47CrS4FpIfX1Xjg67quwJysPVwxkE BojgD9m40uZNAjuAZbY5Ppr4RLCLzMEVzNALk9q7ODyoR0TirJ0VDJS7qWfOmvSIk1xUo3 fFQsEWbhZOhSrbImiRauuJofL1KWl5JonaLNd8d29Z6Fm0gcgUhpsnuJLg5AdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723785183; a=rsa-sha256; cv=none; b=vfuz0d0yscCwXIcxeOjLgJv1jTHP4Tcwget1m57sjxeSr0nDgvDdWfxkCPU4gU1bMRGobQ Px+dFgNJQ/HaREXYyy7faGpsNkUbCUVcEXZnNwZu/FDv4QE+PF1H8uAa9KVrMZcIf8OjrQ maMaCtLPjcO6svXuYiBKSYch9Qw4fx2DHMtvJm6YE4SwCRxo8Z2/QTmL4l6XHWnrs5x06M 9ornH5ZEkEsZG2xuLkTCttnifJoVdDIKxKEbDEKmPH4aTZTMO0W9kpxbgMu0vS6Z0lTVTf 8ImOVdnTv+W+PM6BMxmOgmtfx66snFecjglUpQL1SKlNoJKnbvpXZw6c5JiRjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723785183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nYqjSF9u8z42nX0DKb44GwX9FnICci375XLCTZNvO2U=; b=feSXUqOHQmnDUAk3KAnprLtpuULkSuqNnH8ctcAfqFYPKzJ/+Do+BqyLYStrLHnBY4KBI8 m5Ef0OVjSbnyIPOGnHFK1XMNIHtN4/gRfOB/kp6HXJBtixTqE65Pg99mFx8oZRTSbNf+8R Nx/HRriLjCl8iJcDiNDq+lFwesvgT8IZPOLIGiWA6C1Qtmi1z0LViPEZFYXLszxESBoiGG qEw8pSlbuI+UCZYSbtz3gztKbk3PEAjm/1e+7qrIuwghWnyAEQDlKiYqCduK4qtax62QxH NRqCwRDjiY/8iQsBbsTxAx2UVXAeDZGpzwosJoLuCEMiqA3Tt0UOamS8rGkVpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WlVW33lg3zsq5; Fri, 16 Aug 2024 05:13:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47G5D3pj026771; Fri, 16 Aug 2024 05:13:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47G5D3bk026768; Fri, 16 Aug 2024 05:13:03 GMT (envelope-from git) Date: Fri, 16 Aug 2024 05:13:03 GMT Message-Id: <202408160513.47G5D3bk026768@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 27fd6e518ad7 - main - Mk/UsesMk/compiler.mk: Add c17 argument List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27fd6e518ad7d390caffe3f3c388f1f998672835 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=27fd6e518ad7d390caffe3f3c388f1f998672835 commit 27fd6e518ad7d390caffe3f3c388f1f998672835 Author: Yuri Victorovich AuthorDate: 2024-08-16 05:10:06 +0000 Commit: Yuri Victorovich CommitDate: 2024-08-16 05:10:06 +0000 Mk/UsesMk/compiler.mk: Add c17 argument Claang now accepts -std=c17. Reference: https://en.wikipedia.org/wiki/C17_(C_standard_revision) --- Mk/Uses/compiler.mk | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Mk/Uses/compiler.mk b/Mk/Uses/compiler.mk index d668873e1f2a..375355cfb838 100644 --- a/Mk/Uses/compiler.mk +++ b/Mk/Uses/compiler.mk @@ -2,7 +2,7 @@ # # Feature: compiler # Usage: USES=compiler or USES=compiler:ARGS -# Valid ARGS: env (default, implicit) c++0x c++11-lib c++11-lang c11 nestedfct features +# Valid ARGS: env (default, implicit) c++0x c++11-lib c++11-lang c11 c17 nestedfct features # # c++0x: The port needs a compiler understanding C++0X # c++11-lang: The port needs a compiler understanding C++11 @@ -13,6 +13,7 @@ # gcc-c++11-lib:The port needs g++ compiler with a C++11 library # c++11-lib: The port needs a compiler understanding C++11 and with a C++11 ready standard library # c11: The port needs a compiler understanding C11 +# c17: The port needs a compiler understanding C17 # nestedfct: The port needs a compiler understanding nested functions # features: The port will determine the features supported by the default compiler # @@ -36,7 +37,7 @@ compiler_ARGS= env . endif VALID_ARGS= c++11-lib c++11-lang c++14-lang c++17-lang c++20-lang \ - c++2b-lang c11 features env nestedfct c++0x gcc-c++11-lib + c++2b-lang c11 c17 features env nestedfct c++0x gcc-c++11-lib _CC_hash:= ${CC:hash} _CXX_hash:= ${CXX:hash} @@ -59,6 +60,8 @@ _COMPILER_ARGS+= features c++20-lang _COMPILER_ARGS+= features c++2b-lang . elif ${compiler_ARGS} == c11 _COMPILER_ARGS+= features c11 +. elif ${compiler_ARGS} == c17 +_COMPILER_ARGS+= features c17 . elif ${compiler_ARGS} == features _COMPILER_ARGS+= features . elif ${compiler_ARGS} == env @@ -70,7 +73,7 @@ IGNORE= Invalid argument "${compiler_ARGS}", valid arguments are: ${VALID_ARGS} _COMPILER_ARGS= # . endif -. if ${_COMPILER_ARGS:Mc++*} || ${_COMPILER_ARGS:Mc11} +. if ${_COMPILER_ARGS:Mc++*} || ${_COMPILER_ARGS:Mc11} || ${_COMPILER_ARGS:Mc17} _COMPILER_ARGS+= features . endif @@ -135,7 +138,7 @@ COMPILER_FEATURES= libc++ COMPILER_FEATURES= libstdc++ . endif -CSTD= c89 c99 c11 gnu89 gnu99 gnu11 +CSTD= c89 c99 c11 c17 gnu89 gnu99 gnu11 CXXSTD= c++98 c++0x c++11 c++14 c++17 c++20 c++2b \ gnu++98 gnu++11 gnu++14 gnu++17 gnu++20 gnu++2b @@ -173,7 +176,7 @@ CHOSEN_COMPILER_TYPE= gcc (${_COMPILER_ARGS:Mc++14-lang} && !${COMPILER_FEATURES:Mc++14}) || \ (${_COMPILER_ARGS:Mc++11-lang} && !${COMPILER_FEATURES:Mc++11}) || \ (${_COMPILER_ARGS:Mc++0x} && !${COMPILER_FEATURES:Mc++0x}) || \ -(${_COMPILER_ARGS:Mc11} && !${COMPILER_FEATURES:Mc11}) +(${_COMPILER_ARGS:Mc11} && !${COMPILER_FEATURES:Mc11} && !${COMPILER_FEATURES:Mc17}) . if ${_COMPILER_ARGS:Mc++2b-lang} _LLVM_MINVER= 14 . elif ${_COMPILER_ARGS:Mc++20-lang}