From nobody Thu Sep 21 15:29:29 2023 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 4Rrzpf03W2z4tZFG; Thu, 21 Sep 2023 15:29:30 +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 4Rrzpd60NFz4Mrb; Thu, 21 Sep 2023 15:29:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695310169; 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=1bXJPHqNn/L+0W7B9tEY8mlUIGM7BxG3cBzGvVwyUN0=; b=nKN6Z/mO5Upvw77x1UdwiVFDO/A0fjDHioCdlfdNOm01/6+sm7IoK5aeI7IIX/iZ0X7moM UO1IjGF1R7AfmnjVGsnUlHo4hNvbQ8lrLo1PCQhVK6m9Iqtm7CWOJ9DZ1a9pUlGjf+dQYt CP4GxW8y86OlORE51iEl9N5F5fIGKHxQqIkYrruQzOfotHA0yCwadTkhhFncnhICQCHwPE pZPGxXhf/jqKk4nigyVRTwERVwz7Lgem0BPYSJyhefjz06HMidwwcfnxinZKH7R0NchLXr 3xLj4GaOns7r4HADHIPn3eUBpIYdjoS9cEvPddd0oMONYN2X653QAsJV91etFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695310169; a=rsa-sha256; cv=none; b=mbVb+mN1YGyc4pGjrspdl3TSu7WSq/hI299wu/lt+gYrrv7DtxIAASX7f39lsj7fHHzr4P G+fR3WR7kHAME60qPjDB+3Gpa4PGWAZBxg52WbMBD8sDiWVjj0n2woDeEkQUZug6bdvgU0 n0nsUpgzLix+4MNSziI34Hyq7rQGpplgbvEJhsem/O0UYzQ1AT0z+G/yMSSe7Tfy7q8gH1 6VI69aSXlQTuykU9/sIsL4JkfHENE2Im14GgRrf7yjVPgkWXLlQ/lbxuj+v8jHcrW7ooG6 2P3IsBLfwoYaGcUaUVugoZKehJ/mbQYQp1a+zVdHeHwhlq3FrHjxrnFvtsMarg== 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=1695310169; 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=1bXJPHqNn/L+0W7B9tEY8mlUIGM7BxG3cBzGvVwyUN0=; b=dsH26yH985RaXrizCHP7ygkiJTULXjFY04w9eyGARueN8DvWaxVyLSbGD7K3vEwqvQOf28 OPlVwio+hMqTVKtndRhl6BXe3Vb8b1pPpuWtHh7hSwMQTn9AMyHSQvMFASdMQFNfq3itzz MYx2/i3Cw/90mBFE2wrY6AiM5eNzdnP1eTUAqG2wP6CeIAdFUP3UTCiy3CIoI5W+68OsiD b5dblQU6hWw2sQI3s6GV9tDkZS3+BOxSS3OY8KAfbjcn69c7qx1IXfhf5WR6Y3jiMCVNRE ovaa9RmrC+00T7fRTvgpnQW74RS+WP/IOnoBVw0X8cGVl/BhbmiGLW2Lbqf4Zg== 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 4Rrzpd540NzkX2; Thu, 21 Sep 2023 15:29:29 +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 38LFTTDo090689; Thu, 21 Sep 2023 15:29:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LFTTGH090686; Thu, 21 Sep 2023 15:29:29 GMT (envelope-from git) Date: Thu, 21 Sep 2023 15:29:29 GMT Message-Id: <202309211529.38LFTTGH090686@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: 4e16eb4b2bf4 - main - devel/llvm17: fix openmp library depends 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: 4e16eb4b2bf4fdd56ce9657203723e7adb4582c3 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=4e16eb4b2bf4fdd56ce9657203723e7adb4582c3 commit 4e16eb4b2bf4fdd56ce9657203723e7adb4582c3 Author: Brooks Davis AuthorDate: 2023-09-21 11:06:18 +0000 Commit: Brooks Davis CommitDate: 2023-09-21 15:23:35 +0000 devel/llvm17: fix openmp library depends Don't link with libffi. Reformat long or multi-line OPTION_FOO variables. PR: 273801 Co-authored-by: Ivan Rozhuk --- devel/llvm17/Makefile | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/devel/llvm17/Makefile b/devel/llvm17/Makefile index 73ddc944ca99..8324fe13f3b1 100644 --- a/devel/llvm17/Makefile +++ b/devel/llvm17/Makefile @@ -134,8 +134,9 @@ BE_NATIVE_CMAKE_ON= -DLLVM_TARGETS_TO_BUILD="${NATIVE_BACKENDS:ts;}" BE_STANDARD_DESC= All non-experimental backends BE_WASM_DESC= WebAssembly backend (required by firefox via wasi) .for BE in FREEBSD NATIVE STANDARD -BE_${BE}_PLIST_FILES= ${_BE_LIBS_${BE}:O:S/$/.a/:S|^|%%STATIC_LIBS%%${LLVM_DIR}/lib/libLLVM|} \ - ${_BE_INCS_${BE}:S|^|${LLVM_DIR}/lib/clang/${LLVM_MAJOR}/include/|:N${LLVM_DIR}/lib/clang/${LLVM_MAJOR}/include/$} +BE_${BE}_PLIST_FILES= \ + ${_BE_LIBS_${BE}:O:S/$/.a/:S|^|%%STATIC_LIBS%%${LLVM_DIR}/lib/libLLVM|} \ + ${_BE_INCS_${BE}:S|^|${LLVM_DIR}/lib/clang/${LLVM_MAJOR}/include/|:N${LLVM_DIR}/lib/clang/${LLVM_MAJOR}/include/$} .endfor CLANG_DESC= Build clang CLANG_CMAKE_ON= -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp @@ -155,14 +156,16 @@ CLANG_USE= PERL5=build COMPILER_RT_DESC= Sanitizer libraries COMPILER_RT_CMAKE_ON= -DCOMPILER_RT_INSTALL_PATH=${LLVM_PREFIX}/lib/clang/${LLVM_RELEASE} COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS} -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 @@ -179,13 +182,14 @@ 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_PLIST_SUB= PYTHON_ABIVER=${PYTHON_ABIVER} @@ -193,9 +197,10 @@ 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_DEVICERTL_BCLIB=OFF \ - -DLIBOMPTARGET_DEP_LIBFFI_INCLUDE_DIR="" \ - -DLIBOMPTARGET_DEP_LIBFFI_LIBRARIES="" +OPENMP_CMAKE_ON= \ + -DLIBOMPTARGET_BUILD_DEVICERTL_BCLIB=OFF \ + -DLIBOMPTARGET_DEP_LIBFFI_INCLUDE_DIR="" \ + -DLIBOMPTARGET_DEP_LIBFFI_LIBRARIES="" OPENMP_PORTDOCS= openmp PYCLANG_DESC= Install python bindings to libclang PYCLANG_IMPLIES= CLANG