From nobody Fri Aug 26 07:39:07 2022 X-Original-To: dev-commits-ports-all@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 4MDWtM2LZqz4ZTm4; Fri, 26 Aug 2022 07:39:07 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MDWtM1rThz3gBF; Fri, 26 Aug 2022 07:39:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661499547; 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=GgXorEP4SV9rPVCF1qCSGOf8dMvYsCO1ihJJXH0vRL8=; b=e08Z9ezfbUKcG8FnzLse5iBooWlRpIMkHLKe0CT9p0TBwasyQ4D/TueKIu+MiuhA6xbyxO xws4CfcuLqwBytK+1hALOsXvSKYVb0cp1GDv6lwEw8kCUnUFQEepb8LeJ1TJZLOWxuq/8L 5BzBah80b6i2dmXa7e8g2WOG01RQ685LA4E9oltXn/+tLW2re7lDUmjrLCtcjRi6GTD2f9 P5SNGi8dPDCz4Usxv/PlknQ7MANGOh7KCo2UVzWh/Exq23KRzsU4kV99ITJi1bBLDECTi5 9FvdYc3tu+7nTLv//ZL8adpFCn7lbrhIS3VSmPrl0alZInVFmd4GzbRmywu2xA== 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 4MDWtM0tz2zKNB; Fri, 26 Aug 2022 07:39:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27Q7d7gX031157; Fri, 26 Aug 2022 07:39:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27Q7d7El031156; Fri, 26 Aug 2022 07:39:07 GMT (envelope-from git) Date: Fri, 26 Aug 2022 07:39:07 GMT Message-Id: <202208260739.27Q7d7El031156@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: a60b5f495b51 - main - compiler: use CHOSEN_COMPILER_TYPE instead of COMPILER_TYPE List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a60b5f495b51aaaf674ac9fbcd1ee83434544979 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661499547; 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=GgXorEP4SV9rPVCF1qCSGOf8dMvYsCO1ihJJXH0vRL8=; b=k6ZsIr2vSgdb2z/Wvi9yd+zbMILZoPL81/6XvrgaCXXNeLaCOCYcsTgqKhdHzGLACS/KMs lBpjdjSzv9bYgoFELXzMzz4ePLId/MRpf5qNdQPsbNggoNrR+iDdlQIuU6jipfigTLvUcD 4eUvsxyoERdV2+zIvx8x1x9LxOYRSEIMhDhq/ar408REoPDkAMK4NVg6p6gBkFkcuDRt2m nBND5m4CXkshG+lEm33p2SKg8SZt3osoLSqnUQJYWHUH/oGn1vfG/ac9jdnCcB/zku0HCs y42moEynHKJV2MbFxi3WxSpHg7tvhtZlWMY6i8RHyU4MyWAZzqcfjKy3b23Dfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661499547; a=rsa-sha256; cv=none; b=TocgzuLgumxjCElsD0kRkmH+5sOi61/QyyVMinDokcPYUO2EdiidqT8KStCVVMnTkvAYoL QEVvfOITQWW7XyEZN1lxzZN7tzXiUdTbGcHK5/PcVZdOerBkGIUQ7nD2Wd4/VeWI5EiDmk A4piXDCXNgLNf8LABuFPMkFZxSwqV6uFTjfhYQ9n2iO0m9sWNzkP/Cu4ynTmIx5hSfd8yK DqW4c3cYk3ZiAWjmUwGPph3HXlN2ZLV7v5aABwXlAMdK31rmfkNVeJThP5dPfpI4XnYm/u vrnRC5siRRvIfml7q1eWCsJX9o4dcLJJp+td8cOTlEARyqqejBG1ihIUDpPJuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=a60b5f495b51aaaf674ac9fbcd1ee83434544979 commit a60b5f495b51aaaf674ac9fbcd1ee83434544979 Author: Baptiste Daroussin AuthorDate: 2022-08-26 07:36:08 +0000 Commit: Baptiste Daroussin CommitDate: 2022-08-26 07:39:03 +0000 compiler: use CHOSEN_COMPILER_TYPE instead of COMPILER_TYPE CHOSEN_COMPILER_TYPE is the only safe variable to let a port know which typer of compiler has been elected to be used by the framework PR: 199098 --- audio/funktrackergold/Makefile | 2 +- devel/freebsd-gcc12/Makefile | 2 +- devel/freebsd-gcc6/Makefile | 4 ++-- devel/freebsd-gcc9/Makefile | 2 +- devel/fuzzylite/Makefile | 2 +- devel/google-perftools/Makefile | 2 +- devel/llvm-cheri/Makefile | 2 +- security/botan2/Makefile | 2 +- x11-toolkits/wxgtk28/Makefile | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/audio/funktrackergold/Makefile b/audio/funktrackergold/Makefile index 8c9d39bd5594..a2ae51dabb95 100644 --- a/audio/funktrackergold/Makefile +++ b/audio/funktrackergold/Makefile @@ -25,7 +25,7 @@ OPTIONS_DEFINE= DOCS .include -.if ${COMPILER_TYPE:Mgcc} +.if ${CHOSEN_COMPILER_TYPE:Mgcc} CFLAGS+= -fnested-functions .endif diff --git a/devel/freebsd-gcc12/Makefile b/devel/freebsd-gcc12/Makefile index 0157738b60a1..222138952b50 100644 --- a/devel/freebsd-gcc12/Makefile +++ b/devel/freebsd-gcc12/Makefile @@ -87,7 +87,7 @@ CONFIGURE_TARGET= ${ARCH}-unknown-${OPSYS:tl}${OSREL} .endif .if ${TARGETARCH:Marm*} || ${TARGETARCH} == "aarch64" -. if ${COMPILER_TYPE} == clang +. if ${CHOSEN_COMPILER_TYPE} == clang MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512 . endif .endif diff --git a/devel/freebsd-gcc6/Makefile b/devel/freebsd-gcc6/Makefile index 6ba04426c00d..e60672b2ef1b 100644 --- a/devel/freebsd-gcc6/Makefile +++ b/devel/freebsd-gcc6/Makefile @@ -1,4 +1,4 @@ -PORTNAME= gcc + PORTVERSION= 6.5.0 PORTREVISION= 3 CATEGORIES= devel @@ -74,7 +74,7 @@ CONFIGURE_TARGET= ${ARCH}-unknown-${OPSYS:tl}${OSREL} .endif .if ${TARGETARCH} == "armv6" || ${TARGETARCH} == "aarch64" -. if ${COMPILER_TYPE} == clang +. if ${CHOSEN_COMPILER_TYPE} == clang MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512 . endif .endif diff --git a/devel/freebsd-gcc9/Makefile b/devel/freebsd-gcc9/Makefile index ed873a1de38b..1b6b07b3cfa9 100644 --- a/devel/freebsd-gcc9/Makefile +++ b/devel/freebsd-gcc9/Makefile @@ -87,7 +87,7 @@ CONFIGURE_TARGET= ${ARCH}-unknown-${OPSYS:tl}${OSREL} .endif .if ${TARGETARCH:Marm*} || ${TARGETARCH} == "aarch64" -. if ${COMPILER_TYPE} == clang +. if ${CHOSEN_COMPILER_TYPE} == clang MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512 . endif .endif diff --git a/devel/fuzzylite/Makefile b/devel/fuzzylite/Makefile index 3ed0ef671cbc..4fc3ca828816 100644 --- a/devel/fuzzylite/Makefile +++ b/devel/fuzzylite/Makefile @@ -20,7 +20,7 @@ PLIST_SUB= SHLIB_VER=${DISTVERSION} .include -.if ${COMPILER_TYPE} == clang +.if ${CHOSEN_COMPILER_TYPE} == clang CFLAGS+= -Wno-error=varargs .endif diff --git a/devel/google-perftools/Makefile b/devel/google-perftools/Makefile index ac25a1c3b919..46589074d60f 100644 --- a/devel/google-perftools/Makefile +++ b/devel/google-perftools/Makefile @@ -61,7 +61,7 @@ PORTDOCS= * .include -.if ${COMPILER_TYPE} == "clang" && !defined(USE_GCC) +.if ${CHOSEN_COMPILER_TYPE} == "clang" && !defined(USE_GCC) # clang cannot disable builtins individually CXXFLAGS+= -fno-builtin .endif diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile index c731a081a9ac..1e67d97fd4e5 100644 --- a/devel/llvm-cheri/Makefile +++ b/devel/llvm-cheri/Makefile @@ -196,7 +196,7 @@ post-install-LLD-on: ${LN} -s ld.lld ${STAGEDIR}${LLVM_PREFIX}/bin/ld post-install-LLDB-on: -.if ${OPSYS} != "FreeBSD" || ${COMPILER_TYPE} == clang +.if ${OPSYS} != "FreeBSD" || ${CHOSEN_COMPILER_TYPE} == clang ${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/python*/site-packages/lib .endif diff --git a/security/botan2/Makefile b/security/botan2/Makefile index a85ace4811ba..17de941e4d76 100644 --- a/security/botan2/Makefile +++ b/security/botan2/Makefile @@ -24,7 +24,7 @@ SHEBANG_FILES= configure.py src/python/botan2.py src/scripts/install.py HAS_CONFIGURE= yes CONFIGURE_SCRIPT= configure.py -CONFIGURE_ARGS= --cc=${COMPILER_TYPE} \ +CONFIGURE_ARGS= --cc=${CHOSEN_COMPILER_TYPE} \ --prefix=${PREFIX:Q} \ --with-boost \ --with-bzip2 \ diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile index a346e120df66..9f1680e3a467 100644 --- a/x11-toolkits/wxgtk28/Makefile +++ b/x11-toolkits/wxgtk28/Makefile @@ -83,7 +83,7 @@ CONFIGURE_ARGS+=--enable-unicode .include # GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html -.if ${COMPILER_TYPE} == gcc +.if ${CHOSEN_COMPILER_TYPE} == gcc CONFIGURE_ARGS+= --disable-precomp-headers .endif