From nobody Tue Jan 28 01:00:09 2025 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 4Yhn556sNzz5lcTl; Tue, 28 Jan 2025 01:00:09 +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 4Yhn556KbLz3qKR; Tue, 28 Jan 2025 01:00:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738026009; 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=gR6t4LAiiKtC4hp8tJNh729chr2XD2qPOUnBPQa0BZo=; b=wD8zynBlVcnsvcsPAmJZPiOBUuvvzW/OU+63x9M8hXQVbnJfaITVr5Emn3y6HBaQO42qeC 5xSBVm8Vq0/P5ZTWc0Ewn+sDKeYZgnoHTlbm3ha88Q/2Jys1HAWA+gx0HIfOJgz07fxi7+ ss+7Mtue/hPuWZbGv95Oq1ConSJvqCvyD2NltPf0a1rkPhDYXxOZ1mXrddmkosuByc6boN DB7mGrhnsegeA54cmtw/Q8fCHwiH/7cVyuodDWG4QSxjmj4er7yg7tbNds5RqA38e/qjRk 9mjguP5h94ZxKK/FmZmEDNdURU5yytaNfD1qcKiSypKXIuk8b9bcuewDDp8StQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738026009; 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=gR6t4LAiiKtC4hp8tJNh729chr2XD2qPOUnBPQa0BZo=; b=WXHwXHT7QwEQIpp+RCJg1/1P5ufMI/FTsNiOal5Xe3UEjV3BNfoQz5i0V6JGOxJH1YdQZ2 ujZlpbd92BtFE4iPVSkKl1jbjw5diLvNc6YtAMcPCjHBu6ffDFuDlYqmdXKTVTA8oNmsLv pstlCnYPNBdausjAiH2qTvHPeHG9XQROzFJZKhlqIPTk26J3r8e+1TmkW+K6fcBY4VkjPc HH6gGyR0V2xRHbKnU7t5p6AQAa2xTpw01ecqM8hc0WbvkB5DoFTrOaTmgG+NK/ZNDDd7J2 72T6xRmsbQXWXlJUh4sZWQmiQ/yo1uJFJCba5T/kpjfAduoAf/ndThAkEeg2Xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738026009; a=rsa-sha256; cv=none; b=GB4qkWonPEd4CSJLXQDGE3zTpxAdnf+AHtVWYGGEVpTzHG4cp3uX4T1RpeVekqiERpjlRb bGjXaHI7aK3Vl/KYgWGhb91ESFF2m0uqQ5e5PoHpKBZvGlxevZ+pQx634LPtUprhCYhiiY QIGfdS4Lrx1a8AuInKXuXCNqtLihL193dXh4Hvu7fAYaXaOvzp3jBsFp8YBq80HaPc2EEA GRiKmmWr7Or6EXsAFLqauULNJdqhVLpeN/G1ZuHe4PKpzZ0ABcQlPpqDGquMkZ3/KP6s7c /baB4oCX4rj2GoMLWhv1b2YQ4nV0Tv6QznUB5xClDhRKx5uyHt1zLXzVqRNCMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yhn555mvhzsYZ; Tue, 28 Jan 2025 01:00:09 +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 50S109is049347; Tue, 28 Jan 2025 01:00:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50S109O2049329; Tue, 28 Jan 2025 01:00:09 GMT (envelope-from git) Date: Tue, 28 Jan 2025 01:00:09 GMT Message-Id: <202501280100.50S109O2049329@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: c34c074fc623 - main - devel/llvm-devel: build openmp as a runtime 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: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c34c074fc62387168159b9f011f99265daef5faf Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=c34c074fc62387168159b9f011f99265daef5faf commit c34c074fc62387168159b9f011f99265daef5faf Author: Brooks Davis AuthorDate: 2025-01-21 17:40:01 +0000 Commit: Brooks Davis CommitDate: 2025-01-28 01:00:01 +0000 devel/llvm-devel: build openmp as a runtime OpenMP support can be built as a project or a runtime. LLVM build documentation says that when both are available, runtime is to be prefered. I'm making this change in advance of an expected change to split the Flang runtime from the Flang compiler build (https://github.com/llvm/llvm-project/pull/110217). This changes where omp_lib.h is installed for Flang use and which Fortran modules are installed (removes .f18.mod versions). Sponsored by: DARPA, AFRL --- devel/llvm-devel/Makefile | 4 ++-- devel/llvm-devel/Makefile.MAN1SRCS | 3 +-- devel/llvm-devel/files/patch-revert-6d7e428df611 | 17 ----------------- devel/llvm-devel/pkg-plist | 4 +--- 4 files changed, 4 insertions(+), 24 deletions(-) diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index ef77c0d9cf7d..bc36e5acfb8b 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm PORTVERSION= ${LLVM_MAJOR}.0.d${SNAPDATE} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel lang PKGNAMESUFFIX= ${LLVM_SUFFIX} @@ -279,7 +279,7 @@ COMMANDS+= ${MLIR_COMMANDS} .endif .if ${PORT_OPTIONS:MOPENMP} -LLVM_ENABLE_PROJECTS+= openmp +LLVM_ENABLE_RUNTIMES+= openmp USE_LDCONFIG+= ${LLVM_PREFIX}/lib/${CONFIGURE_TARGET} MAN1SRCS+= ${OPENMP_MAN1SRCS} COMMANDS+= ${OPENMP_COMMANDS} diff --git a/devel/llvm-devel/Makefile.MAN1SRCS b/devel/llvm-devel/Makefile.MAN1SRCS index a2ad7ea5ac53..b564a5c8df45 100644 --- a/devel/llvm-devel/Makefile.MAN1SRCS +++ b/devel/llvm-devel/Makefile.MAN1SRCS @@ -66,8 +66,7 @@ LIT_MAN1SRCS= \ lit.1 \ FileCheck.1 -OPENMP_MAN1SRCS= \ - llvmopenmp.1 +OPENMP_MAN1SRCS= POLLY_MAN1SRCS= \ polly.1 diff --git a/devel/llvm-devel/files/patch-revert-6d7e428df611 b/devel/llvm-devel/files/patch-revert-6d7e428df611 deleted file mode 100644 index 07f556e9284c..000000000000 --- a/devel/llvm-devel/files/patch-revert-6d7e428df611 +++ /dev/null @@ -1,17 +0,0 @@ ---- compiler-rt/lib/builtins/CMakeLists.txt.orig -+++ compiler-rt/lib/builtins/CMakeLists.txt -@@ -867,12 +867,10 @@ - endif() - endif() - endif() -- check_c_source_compiles("_Float16 foo(_Float16 x) { return x; } -- int main(void) { return 0; }" -+ check_c_source_compiles("_Float16 foo(_Float16 x) { return x; }" - COMPILER_RT_HAS_${arch}_FLOAT16) - append_list_if(COMPILER_RT_HAS_${arch}_FLOAT16 -DCOMPILER_RT_HAS_FLOAT16 BUILTIN_CFLAGS_${arch}) -- check_c_source_compiles("__bf16 foo(__bf16 x) { return x; } -- int main(void) { return 0; }" -+ check_c_source_compiles("__bf16 foo(__bf16 x) { return x; }" - COMPILER_RT_HAS_${arch}_BFLOAT16) - # Build BF16 files only when "__bf16" is available. - if(COMPILER_RT_HAS_${arch}_BFLOAT16) diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist index b28eb02d41ba..3dc34a5c1625 100644 --- a/devel/llvm-devel/pkg-plist +++ b/devel/llvm-devel/pkg-plist @@ -1684,7 +1684,6 @@ llvm-devel/bin/verify-uselistorder %%FLANG%%llvm-devel/include/flang/Lower/Support/Verifier.h %%FLANG%%llvm-devel/include/flang/Lower/SymbolMap.h %%FLANG%%llvm-devel/include/flang/Lower/VectorSubscripts.h -%%FLANG%%%%OPENMP%%llvm-devel/include/flang/OpenMP/omp_lib.h %%FLANG%%llvm-devel/include/flang/Optimizer/Analysis/AliasAnalysis.h %%FLANG%%llvm-devel/include/flang/Optimizer/Analysis/TBAAForest.h %%FLANG%%llvm-devel/include/flang/Optimizer/Builder/BoxValue.h @@ -1920,9 +1919,8 @@ llvm-devel/bin/verify-uselistorder %%FLANG%%llvm-devel/include/flang/iso_fortran_env.mod %%FLANG%%llvm-devel/include/flang/iso_fortran_env_impl.mod %%FLANG%%llvm-devel/include/flang/mma.mod -%%FLANG%%%%OPENMP%%llvm-devel/include/flang/omp_lib.f18.mod +%%FLANG%%%%OPENMP%%llvm-devel/include/flang/omp_lib.h %%FLANG%%%%OPENMP%%llvm-devel/include/flang/omp_lib.mod -%%FLANG%%%%OPENMP%%llvm-devel/include/flang/omp_lib_kinds.f18.mod %%FLANG%%%%OPENMP%%llvm-devel/include/flang/omp_lib_kinds.mod %%LLD%%llvm-devel/include/lld/Common/Args.h %%LLD%%llvm-devel/include/lld/Common/Arrays.h