From nobody Thu Sep 21 15:29:21 2023 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 4RrzpV0jQXz4tZ7b; Thu, 21 Sep 2023 15:29:22 +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 4RrzpT68Snz4MFn; Thu, 21 Sep 2023 15:29:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695310161; 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=IkBt2EwmpLNxd2yBa+z1Aw7hiW+XXwDlki3bcrCxl6Q=; b=JetIXutko1WD8M2A6XViHXTy07bL8hFWgXJXoGudPaBLKM42ylu8oe96HE4j5rbVRDAzrk hHgEvW+dgkiA2PsfUyZu7OYkPjPFgxlyd1g5UkCPiclMyQUaJu0RjGGduvTGxNMdK7rvEv +eTnwLn2MBXdtiDHtvj++Epte7jfLh6z9C9X/T5Xjuj1L6Fl057sP5uBorKccx8ZHm6sWt luTAMugqqCs80DuYkaKtNoYJlcVKSxnHj63cKTXqXOisai5zSEy95xRmfmyRvzbHcsqtyF 7YTeQAfoVshM9wRpdpSYh48llXGjavicuxZw4OWA8Q7scy3gc7pvI3rWd/BWQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695310161; a=rsa-sha256; cv=none; b=tRQy+DepsVAVGfrmPqgZZd2MHKDaXfBEojOKs7CQjpBR+SY7rXZcIbBarbBfO9sDT2jKWm zTSuiEhNcyT8ydrYR3IeIeJYthSkr+XnS+uEHr5j7qBKxcFO4IySx1ghLFnyDlOiUR4bmw G2Je5LMrKAwYhZhad1k5amy/U3qhhowqGrVG+FeDdOoio1l9fmhdkN1FBhk43u95MZBszy ZPmGOPnOck7uiO5TRWpdwZIJ01wMKgfEJHy6dpsQdbdiuqw4uD7yPY7XOAVTSW8jWjD/mw f2Hr0Zguzqi83m3GJ/DAvahtMES9929qwfYTB2/q6k5xxSmiTRuXVKwaUBUCHQ== 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=1695310161; 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=IkBt2EwmpLNxd2yBa+z1Aw7hiW+XXwDlki3bcrCxl6Q=; b=f9H8/zadxCxG91A0EogmOeQJXzrgnIe56ZSCuzZPe4cohJuxSHH7goNxluWoSyDVEGD/hU 0PzX7ugFHvIhQKIkR+oUfDXwVqGSPa7uKftMUSek2kob/GVFFvYZ4nFRhFgqiX+BQ41ZaX 1I0ug061Qxujj/RGQ/XaRLQMieZjhsWM8u2pDT1M//ju3kBuAmgQe/ndr64rlZ9FmAkXoG MdWSpKglM9Kool5UrVdwxrRPndNo8hV4LZ3DGdpglsbJvf8nN/V2xMfC4dvqfUbpozhQsi rlpOkHf0NbX7wMunIg4pthw3w5A8RUhzlJdQlVA4aVJ0cp+8bmrxKRiAQgSViw== 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 4RrzpT5Fh1zkjJ; Thu, 21 Sep 2023 15:29:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LFTLVA090375; Thu, 21 Sep 2023 15:29:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LFTLhA090372; Thu, 21 Sep 2023 15:29:21 GMT (envelope-from git) Date: Thu, 21 Sep 2023 15:29:21 GMT Message-Id: <202309211529.38LFTLhA090372@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: f9f9bb0e1871 - main - devel/llvm13: fix openmp library depends 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: f9f9bb0e1871b0c08a3cb83c6157c7918748ec9b Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=f9f9bb0e1871b0c08a3cb83c6157c7918748ec9b commit f9f9bb0e1871b0c08a3cb83c6157c7918748ec9b Author: Brooks Davis AuthorDate: 2023-09-21 10:30:04 +0000 Commit: Brooks Davis CommitDate: 2023-09-21 15:23:32 +0000 devel/llvm13: fix openmp library depends Use base system libelf and don't link with libffi. Reformat long and/or multi-line OPTION_FOO variables. PR: 273801 Co-authored-by: Ivan Rozhuk --- devel/llvm13/Makefile | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile index b4b9bc2ae74d..df0008427fb3 100644 --- a/devel/llvm13/Makefile +++ b/devel/llvm13/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 13.0.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \ https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR} @@ -134,19 +134,22 @@ COMPILER_RT_DESC= Sanitizer libraries # An unwind.h is require to build. I think an in-tree one should be used # but this seems to work as a workaround... COMPILER_RT_BUILD_DEPENDS= libunwind>0:devel/libunwind -COMPILER_RT_CMAKE_ON= -DCOMPILER_RT_INSTALL_PATH=${LLVM_PREFIX}/lib/clang/${LLVM_RELEASE} +COMPILER_RT_CMAKE_ON= \ + -DCOMPILER_RT_INSTALL_PATH=${LLVM_PREFIX}/lib/clang/${LLVM_RELEASE} # Allow unwind.h to be found reliably COMPILER_RT_USES= localbase COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ ${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|} -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx-markdown-tables>=0:textproc/py-sphinx-markdown-tables@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} +DOCS_BUILD_DEPENDS= \ + ${PYTHON_PKGNAMEPREFIX}sphinx-markdown-tables>=0:textproc/py-sphinx-markdown-tables@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} DOCS_CONFLICTS_BUILD= cmark DOCS_PORTDOCS= llvm -DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \ - -DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \ - -DSPHINX_WARNINGS_AS_ERRORS=OFF \ - -DLLVM_BUILD_DOCS=ON +DOCS_CMAKE_ON= \ + -DLLVM_ENABLE_SPHINX=ON \ + -DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \ + -DSPHINX_WARNINGS_AS_ERRORS=OFF \ + -DLLVM_BUILD_DOCS=ON DOCS_PLIST_FILES= ${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|} EXTRAS_DESC= Extra clang tools EXTRAS_IMPLIES= CLANG @@ -162,20 +165,26 @@ LIT_DESC= Install lit and FileCheck test tools LIT_VARS= _USES_PYTHON=python LLD_DESC= Install lld, the LLVM linker LLDB_BUILD_DEPENDS= swig:devel/swig -LLDB_CMAKE_ON= -DLUA_INCLUDE_DIR=${LOCALBASE}/include/lua${LUA_VER_STR} \ - -DLUA_LIBRARY=${LOCALBASE}/lib/liblua-${LUA_VER}.so \ - -DCURSES_INCLUDE_PATH=/usr/include \ - -DCURSES_CURSES_LIBRARY=/usr/lib/libcurses.so \ - -DCURSES_FORM_LIBRARY=/usr/lib/libform.so \ - -DCURSES_NCURSES_LIBRARY=/usr/lib/libncurses.so \ - -DPANEL_LIBRARIES=/usr/lib/libpanel.so +LLDB_CMAKE_ON= \ + -DLUA_INCLUDE_DIR=${LOCALBASE}/include/lua${LUA_VER_STR} \ + -DLUA_LIBRARY=${LOCALBASE}/lib/liblua-${LUA_VER}.so \ + -DCURSES_INCLUDE_PATH=/usr/include \ + -DCURSES_CURSES_LIBRARY=/usr/lib/libcurses.so \ + -DCURSES_FORM_LIBRARY=/usr/lib/libform.so \ + -DCURSES_NCURSES_LIBRARY=/usr/lib/libncurses.so \ + -DPANEL_LIBRARIES=/usr/lib/libpanel.so LLDB_DESC= Install lldb, the LLVM debugger LLDB_IMPLIES= CLANG LLDB_USES= lua:53 libedit LLDB_VARS= _USES_PYTHON=python MLIR_DESC= Multi-Level Intermediate Representation OPENMP_DESC= Install libomp, the LLVM OpenMP runtime library -OPENMP_CMAKE_ON= -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF +OPENMP_CMAKE_ON= \ + -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF \ + -DLIBOMPTARGET_DEP_LIBELF_INCLUDE_DIR="/usr/include/libelf.h" \ + -DLIBOMPTARGET_DEP_LIBELF_LIBRARIES="/usr/lib/libelf.so" \ + -DLIBOMPTARGET_DEP_LIBFFI_INCLUDE_DIR="" \ + -DLIBOMPTARGET_DEP_LIBFFI_LIBRARIES="" OPENMP_PORTDOCS= openmp PYCLANG_DESC= Install python bindings to libclang PYCLANG_IMPLIES= CLANG