From nobody Thu Sep 29 22:48:48 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 4MdpSK0Gs0z4YMcJ; Thu, 29 Sep 2022 22:48:49 +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 4MdpSJ6zdPz3TfX; Thu, 29 Sep 2022 22:48:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664491729; 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=yQO38IeBxJSNzF2jxvUk97Bf+P1jM1Zcaj+Y6NUaT04=; b=Wi6fCN2xXUCtVwwB0aDZktU3/78xm+430CZrpEpJ/bj2hbJZeyn6NJnqNJSqvotn4DjS7z 8fSPjvQRyDnAUhqMKokrVcNmNqmFLgNdPafdaBCZpCLiQvyUziHNgRg/bHiUW3gZGTDJb0 hcJMBSSb8yTE7qqlxi3eOYsrVOjFFrt/PcV8c2aaGSD5qFP4pj01JKy0744Li9r0m2UyGo pbwUu3VXWHoi2yhJhRBKFUEWX5NtKZu3+NMZUMYQNxm73X9lc7JjtXgao5uq/1W0GFFAKs Z07lj7qfJJgPxTdPsxFTMsO54ILUFXHPxkjDCADtFyZezIwsRo6HLE7GGZ2fKA== 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 4MdpSJ64Wvzy24; Thu, 29 Sep 2022 22:48:48 +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 28TMmm4u052209; Thu, 29 Sep 2022 22:48:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28TMmmmM052208; Thu, 29 Sep 2022 22:48:48 GMT (envelope-from git) Date: Thu, 29 Sep 2022 22:48:48 GMT Message-Id: <202209292248.28TMmmmM052208@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brooks Davis Subject: git: a3c9588e81dd - main - devel/llvm-devel: simplify option declerations (NFC) 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: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a3c9588e81ddae1fe37bb1f091b135c7b8e423d1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664491729; 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=yQO38IeBxJSNzF2jxvUk97Bf+P1jM1Zcaj+Y6NUaT04=; b=hhvNIzmVxeYaHyoJ7A0C2tRAzDAri+p4zdWFg1PkxSVVN2UCR1bjSHPpfeAYJXo0MQSoTn reTJ1w4LMfjLSu338I5suVtbZGPSYuUZk7V4CD9j8ZWaMHBy5jT5EsrojcTW7GYxwJkryh 0IkqWOdtK0qdkEwLuLxQ9IiDOIbk9id8nMWSazWyYv2dqsuPHFVsuTrxFo16CQ5purFveP 5syi1hMpt8D/1bfGM5sDZ+CP3/tS82wX/sjHJSNYiHee6LZBa3Zx2rHjwavssL0PsMxvya iVV835i9rAMLzVkmS7TwbxVh20iDY+7h+gyvsgu0T5KYRz3fr4M5wDkLhpqpDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664491729; a=rsa-sha256; cv=none; b=VhmTH82Yx/1WG6z6s25glBXCwJgKXObzCua68u8JhLZgTmaPjVFIbSOnb07aWjVEnPLpIo dEVjred6ccBkj8eySPPTBJfXi2+h2gViUl1/tM8RSZs3h2mhr1NYwynplakbparxVnElRF J0nf482V1LPIuHhy6UVQ85QD6QsfqfmuIDAWI+KjFKAM8IqX0Gdd+IYI4DPSIVJoMMHYeF CnQJc1qazE3Xc8KfmQAZU1io5P9W3oGZdN/r1BZgU6rMPBQ47TjTk6ZpJXTWisQh/SYAOf YhHlzqKkGO7iPQGv4agjKaWaX80VVg/cs5GLjNQSnjvUV4z09s1bTFGNr97onQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=a3c9588e81ddae1fe37bb1f091b135c7b8e423d1 commit a3c9588e81ddae1fe37bb1f091b135c7b8e423d1 Author: Brooks Davis AuthorDate: 2022-09-29 22:48:40 +0000 Commit: Brooks Davis CommitDate: 2022-09-29 22:48:40 +0000 devel/llvm-devel: simplify option declerations (NFC) In for non-lite flavors, include and DEFINE and DEFAULT COMPILER_RT and OPENMP and then EXCLUDE them on 32-bit arm and all 32-bit systems respectively. --- devel/llvm-devel/Makefile | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index 44dfdb56e7fe..0058f2713183 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -82,26 +82,20 @@ GH_TAGNAME= ${LLVM_PROJECT_COMMIT} OPTIONS_DEFINE= CLANG DOCS LLD STATIC_LIBS OPTIONS_DEFAULT= CLANG LLD .if !${FLAVOR:Mlite} -OPTIONS_DEFINE_aarch64= COMPILER_RT OPENMP -OPTIONS_DEFINE+= EXTRAS FLANG LIT LLDB MLIR -OPTIONS_DEFINE_amd64= COMPILER_RT GOLD OPENMP -OPTIONS_DEFINE_i386= COMPILER_RT -OPTIONS_DEFINE_powerpc= COMPILER_RT GOLD -OPTIONS_DEFINE_powerpc64= COMPILER_RT GOLD OPENMP -OPTIONS_DEFINE_powerpc64le= COMPILER_RT GOLD OPENMP -OPTIONS_DEFINE_riscv64= COMPILER_RT OPENMP -OPTIONS_DEFAULT+= EXTRAS FLANG LIT LLDB STATIC_LIBS -OPTIONS_DEFAULT_aarch64= COMPILER_RT OPENMP -OPTIONS_DEFAULT_amd64= COMPILER_RT GOLD OPENMP -OPTIONS_DEFAULT_i386= COMPILER_RT -OPTIONS_DEFAULT_powerpc= COMPILER_RT GOLD -OPTIONS_DEFAULT_powerpc64= COMPILER_RT GOLD OPENMP -OPTIONS_DEFAULT_powerpc64le= COMPILER_RT GOLD OPENMP -OPTIONS_DEFAULT_riscv64= COMPILER_RT OPENMP -OPTIONS_EXCLUDE_armv6= FLANG -OPTIONS_EXCLUDE_armv7= FLANG -OPTIONS_EXCLUDE_i386= FLANG -OPTIONS_EXCLUDE_powerpc= FLANG +OPTIONS_DEFINE+= COMPILER_RT EXTRAS FLANG LIT LLDB MLIR OPENMP +OPTIONS_DEFINE_amd64= GOLD +OPTIONS_DEFINE_powerpc= GOLD +OPTIONS_DEFINE_powerpc64= GOLD +OPTIONS_DEFINE_powerpc64le= GOLD +OPTIONS_DEFAULT+= COMPILER_RT EXTRAS FLANG LIT LLDB STATIC_LIBS OPENMP +OPTIONS_DEFAULT_amd64= GOLD +OPTIONS_DEFAULT_powerpc= GOLD +OPTIONS_DEFAULT_powerpc64= GOLD +OPTIONS_DEFAULT_powerpc64le= GOLD +OPTIONS_EXCLUDE_armv6= COMPILER_RT FLANG OPENMP +OPTIONS_EXCLUDE_armv7= COMPILER_RT FLANG OPENMP +OPTIONS_EXCLUDE_i386= FLANG OPENMP +OPTIONS_EXCLUDE_powerpc= FLANG OPENMP OPTIONS_EXCLUDE_riscv64= LLDB .endif OPTIONS_SUB= yes