From nobody Tue Jan 11 17:12:50 2022 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 2B3311947B12; Tue, 11 Jan 2022 17:12:51 +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 4JYHM65J0bz3nmj; Tue, 11 Jan 2022 17:12:50 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 89AF41D285; Tue, 11 Jan 2022 17:12:50 +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 20BHCotf019636; Tue, 11 Jan 2022 17:12:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20BHCoJ6019635; Tue, 11 Jan 2022 17:12:50 GMT (envelope-from git) Date: Tue, 11 Jan 2022 17:12:50 GMT Message-Id: <202201111712.20BHCoJ6019635@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: bbe2fcc4d671 - main - devel/llvm-devel: fix i386 builds, minor improvements 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: bbe2fcc4d6715ada89d47b132a383e06faee80c0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641921170; 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=7IhGrWRJSYUyLpuEbToC+MlHuFre6k+78XUvNgHmBlI=; b=oQ4ylh7tXMxA6lrZyayekmb8/VgaKls+ZA6PbiLHFE/kTmmWViyW15qrK5YzE5OK9QsEVZ IgH70wV80Bd/94LJV2pRGqiTVIz0QsY6qbrl/MKSD6QknNXBw+H+XGH/8hLyAHNF328zgj yTEVGarDomBQgYyshDFeS7dFLUOENZkFl1icH/C4hRLIBoiROwopryoSQ0gVuSJcUmFvKC ei3GRkmP22QnJd1jHPY2Py6DVsY1msohBb16odgA7BC7/aVKtq2r6Kim9ve7wqyKOzVKZz piWtyRufLyxbK7xx1wrWD9WyCTZMNYuPBWAXFQQudV7FD0yxEbfCzjO3JUedHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641921170; a=rsa-sha256; cv=none; b=ZpqxuAUVlveDNw2KeGf7+eXG8rD2XG0hIHVk4mfr/D2/Q7Cdi1f0Zp4E9wnnq46l3Afkpz 8vaT9bIE2qJ+PBCV1lUPC2bBv3Z6qkXrQbrlIpFUUFsZ66jh79MYMUDpCk+SQkBm8J6V/5 v8vo9bi8TWMubW/JjhpIRrHekZlRpwrxh5ehQWwSuKyQ+BduK5/OsvsrvPwxyuzHob8pOE Uw/M2PB3KUwWpidAsL4FoDs7jzfTsnfYiA5bPrBu+by+mwFWr9Dk3hrueFoHGx+IjRiL41 ihZ6iRpCF1nyGb2QfT3bL3n4z8qlaEasUzxqsT3BgkfFpL4AOuSLWY7j41mXvg== 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=bbe2fcc4d6715ada89d47b132a383e06faee80c0 commit bbe2fcc4d6715ada89d47b132a383e06faee80c0 Author: Brooks Davis AuthorDate: 2022-01-11 17:06:23 +0000 Commit: Brooks Davis CommitDate: 2022-01-11 17:12:07 +0000 devel/llvm-devel: fix i386 builds, minor improvements Fix OpenMP build on i386 by removing a bogus assert. The assert was added in https://reviews.llvm.org/D114270 and is wrong on 32-bit. It's a little unclear if this will work of if we should disable the AMDGPU plugin on i386. Remove some conflicts for long-removed packages (clang-devel and iomp5-devel). Don't hardcode PYTHON_EXT_SUFFIX in the plist. [0] PR: 261034 [0] Reported by: Trond.Endrestol@ximalas.info [0] --- devel/llvm-devel/Makefile | 3 +-- .../patch-openmp_libomptarget_plugins_amdgpu_impl_internal.h | 10 ++++++++++ devel/llvm-devel/pkg-plist | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index 11d150e3c9ef..94a8f79d9932 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -114,7 +114,6 @@ PLIST_FILES= PLIST_SUB_SED_EXCLUDE_VAL= lib "3.0.0" CLANG_DESC= Build clang -CLANG_CONFLICTS_INSTALL= clang-devel CLANG_CMAKE_ON= -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp \ -DCLANG_LINK_LLVM_DYLIB=ON CLANG_PORTDOCS= clang @@ -165,7 +164,6 @@ LLDB_VARS= _USES_PYTHON=python:3.6+ MLIR_DESC= Multi-Level Intermediate Representation OPENMP_DESC= Install libomp, the LLVM OpenMP runtime library OPENMP_PORTDOCS= openmp -OPENMP_CONFLICTS_INSTALL= libiomp5-devel OPENMP_USES= perl5 OPENMP_USE= PERL5=build STATIC_LIBS_DESC= Install static libraries (does not effect sanitizers) @@ -541,6 +539,7 @@ build-plist: ${GREP} -v '[/-]lit$$' | ${GREP} -v 'FileCheck$$' | \ ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \ -e 's|${PYTHON_SITELIBDIR:C|${PREFIX}/||}|%%PYTHON_SITELIBDIR%%|' \ + -e 's|${PYTHON_EXT_SUFFIX:C/\./\\./g}|%%PYTHON_EXT_SUFFIX%%|' \ -e 's|${PORTVERSION}|%%PORTVERSION%%|' \ -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' \ -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \ diff --git a/devel/llvm-devel/files/patch-openmp_libomptarget_plugins_amdgpu_impl_internal.h b/devel/llvm-devel/files/patch-openmp_libomptarget_plugins_amdgpu_impl_internal.h new file mode 100644 index 000000000000..8b745c18d5a5 --- /dev/null +++ b/devel/llvm-devel/files/patch-openmp_libomptarget_plugins_amdgpu_impl_internal.h @@ -0,0 +1,10 @@ +--- openmp/libomptarget/plugins/amdgpu/impl/internal.h.orig ++++ openmp/libomptarget/plugins/amdgpu/impl/internal.h +@@ -42,7 +42,6 @@ + unsigned long unused1; + unsigned long unused2; + } impl_implicit_args_t; +-static_assert(sizeof(impl_implicit_args_t) == 56, ""); + + // ---------------------- Kernel Start ------------- + typedef struct atl_kernel_info_s { diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist index d6e19a8028ea..dba982fe7475 100644 --- a/devel/llvm-devel/pkg-plist +++ b/devel/llvm-devel/pkg-plist @@ -126,7 +126,7 @@ bin/split-file-devel %%LIT%%bin/llvm-lit-devel %%LIT%%llvm-devel/bin/llvm-lit %%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/__init__.py -%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/_lldb.cpython-38.so +%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/_lldb%%PYTHON_EXT_SUFFIX%%.so %%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/embedded_interpreter.py %%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/formatters/Logger.py %%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/formatters/__init__.py