From nobody Thu Jul 18 16:50:12 2024 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 4WPzLv0pznz5Rk5S; Thu, 18 Jul 2024 16:50:15 +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 4WPzLs1qhPz4X70; Thu, 18 Jul 2024 16:50:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721321413; 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=Csxj2uVNtbN1c0fAociI9RI4M0sMpaoHHEMek0fpOOE=; b=Z5wdErAV/oP5hInWc2GMx6OONDaGz6MJ/7hrbfnDO+jw+IDQqjy9tpGbxthYCdw5HniIac FU/7LQeC7UWrPj3metqof+NJRiX/XqVo7zfqjncMnBemwmyiLhX/1JmVWElvA3coU3OB+F wafqCverP0uPo0OCAV7UlNGXs0LbF0+5pkiew9+ONolV5yw6QooFXujCgJjNYElgced3/n yM4baQEeOePW1bMGHyFfmQVLEWmC/Pfexr6jBnZ0G+DbXluYw4mvWIkIBEMby9mMR6+xvv is6iH0ZFXPSU/PAClnEuFqrWt11gF0NqkBBg7o+K1+mkhrZUreABM7za73t77w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721321413; a=rsa-sha256; cv=none; b=lk8cuWfI7iEM5hrSgZXYIlxfmM11/0bG8s5MFXdmezYCStvhTTWqb9qhXAR8Z7UHodIv08 wkkqwQLEk/4dC9mUpxYVPfn8xPZ3k8hVCDBTd7fDnpWhMUPkZK7tHRWuqx+3oQpWRxEQFx Dnh95ltVdtGw7ITDQHX2LFE71BCmQtcquMSEOmXizO9WJhOMO6cuH662obI+w0hJc+MNpC IJikeKDamcXZ6250k6qcAwTs/t/DHBxsBX48NaRDnhOphH1fsHjO2UskDI0eSpZTw1t4yT 0bg6F+6F+oTizca64qX7rvnZ8YGjb5bc9zu4IaTuA8zT+Sbg0RTNc0Eay38rhw== 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=1721321413; 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=Csxj2uVNtbN1c0fAociI9RI4M0sMpaoHHEMek0fpOOE=; b=uBVxzAWS7QPRG0JHarwXgE8D7mdh+S5cH/PmsD4EvOBmv01VZP76/ga571t0UZLltNFWtB ZPwouEB2D5OaNOifycHuDDuce5CAGJlQCY+7jfQaVWM7wTpLCs5jPxEJlTUq5MFWv0E5NX hCdXBY9UZMZU12GNbSM1Td+H/Pgam5CWNBUXWerX4AYnYmg4X1VhbpwgTR1EU1Pm8kUEUw z5C1/GLpxe8XfVoZ3nFmPqXPsur63RxLDwY+4ATTK2/hSX5Y7FzOIrPMw4UTlofDL1wPeo zXo0K4vU/jMLtIS2wNMvQJ/er4IlVQeHj+xkyY3PQY5PmLGVnYGlzyDUn+cDIQ== 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 4WPzLr6vGdzwjM; Thu, 18 Jul 2024 16:50:12 +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 46IGoCKv019878; Thu, 18 Jul 2024 16:50:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46IGoCo7019867; Thu, 18 Jul 2024 16:50:12 GMT (envelope-from git) Date: Thu, 18 Jul 2024 16:50:12 GMT Message-Id: <202407181650.46IGoCo7019867@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 4ef844c201fe - main - lang/cling: Fix build 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ef844c201fe2c1b94556aabd9aa5fd2178cf034 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=4ef844c201fe2c1b94556aabd9aa5fd2178cf034 commit 4ef844c201fe2c1b94556aabd9aa5fd2178cf034 Author: Po-Chuan Hsieh AuthorDate: 2024-07-18 16:47:54 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-07-18 16:47:54 +0000 lang/cling: Fix build - While I'm here: - Use = instead of += for CMAKE_ARGS, PLIST_SUB and SUB_LIST - Remove CMAKE_BUILD_TYPE - Clean up Makefile - Cosmetic change ld: error: version script assignment of 'LLVM_5.0' to symbol 'LLVMCreateDisasm' failed: symbol not defined ld: error: version script assignment of 'LLVM_5.0' to symbol 'LLVMCreateDisasmCPU' failed: symbol not defined ld: error: version script assignment of 'LLVM_5.0' to symbol 'LLVMDisasmDispose' failed: symbol not defined ld: error: version script assignment of 'LLVM_5.0' to symbol 'LLVMDisasmInstruction' failed: symbol not defined ld: error: version script assignment of 'LLVM_5.0' to symbol 'LLVMSetDisasmOptions' failed: symbol not defined c++: error: linker command failed with exit code 1 (use -v to see invocation) Reference: https://pkg-status.freebsd.org/beefy16/data/133amd64-default/a71eaeb3e54e/logs/cling-0.5.2018.08.13_12.log --- lang/cling/Makefile | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/lang/cling/Makefile b/lang/cling/Makefile index 4953fbd66790..57ecda8dcaf3 100644 --- a/lang/cling/Makefile +++ b/lang/cling/Makefile @@ -23,39 +23,32 @@ BROKEN_riscv64= fails to build: CMake Error at cmake/config-ix.cmake:407: Unkno LIB_DEPENDS= libgtest.so:devel/googletest \ libz3.so:math/z3 +USES= cmake compiler:c++11-lib compiler:c11 gnome libedit ncurses python:build shebangfix tar:bzip2 +USE_GNOME= libxml2 + +CMAKE_ARGS= -DINSTALL_LAYOUT=FREEBSD +CMAKE_INSTALL_PREFIX= ${LLVM_PREFIX} +CMAKE_OFF= LLVM_BUILD_EXAMPLES LLVM_INCLUDE_TESTS LLVM_INCLUDE_GO_TESTS +CMAKE_ON= BUILD_SHARED_LIBS +LDFLAGS+= -Wl,--undefined-version +USE_LDCONFIG= ${LLVM_PREFIX}/lib WRKSRC= ${WRKDIR}/src +SUB_LIST= LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}" +PLIST_SUB= LLVM_SUFFIX=${LLVM_SUFFIX} LLVM_RELEASE=${LLVM_RELEASE} + LLVM_RELEASE= 5.0.0 LLVM_SUFFIX= 50_cern-root LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} -USES= cmake compiler:c++11-lib compiler:c11 gnome libedit ncurses \ - python:build shebangfix tar:bzip2 -USE_GNOME= libxml2 -USE_LDCONFIG= ${LLVM_PREFIX}/lib - -CONFLICTS_INSTALL= llvm zapcc # # bin/bugpoint bin/c-index-test bin/clang bin/clang++ bin/clang-5.0 bin/clang-check bin/clang-cl bin/clang-cpp bin/clang-format bin/clang-import-test bin/clang-offload-bundler bin/clang-rename bin/git-clang-format +CONFLICTS_INSTALL= llvm zapcc # bin/bugpoint bin/c-index-test bin/clang bin/clang++ bin/clang-5.0 bin/clang-check bin/clang-cl bin/clang-cpp bin/clang-format bin/clang-import-test bin/clang-offload-bundler bin/clang-rename bin/git-clang-format SHEBANG_FILES= tools/clang/tools/clang-format/clang-format-diff.py \ tools/clang/tools/clang-format/git-clang-format \ tools/clang/tools/scan-view/bin/scan-view -CMAKE_ON= BUILD_SHARED_LIBS -CMAKE_OFF= LLVM_BUILD_EXAMPLES LLVM_INCLUDE_TESTS LLVM_INCLUDE_GO_TESTS - -SUB_LIST+= LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}" -PLIST_SUB+= LLVM_SUFFIX=${LLVM_SUFFIX} LLVM_RELEASE=${LLVM_RELEASE} - -CMAKE_BUILD_TYPE= Release -CMAKE_INSTALL_PREFIX= ${LLVM_PREFIX} - -CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD - post-patch: - @${REINPLACE_CMD} -e 's|%%LLVM_PREFIX%%|${LLVM_PREFIX}|g' \ - ${PATCH_WRKSRC}/tools/cling/tools/driver/cling.cpp - @${REINPLACE_CMD} -e 's|%%LLVM_PREFIX%%|${LLVM_PREFIX}|g' \ - ${PATCH_WRKSRC}/tools/cling/lib/Interpreter/CIFactory.cpp + @${REINPLACE_CMD} -e 's|%%LLVM_PREFIX%%|${LLVM_PREFIX}|g' ${WRKSRC}/tools/cling/lib/Interpreter/CIFactory.cpp ${WRKSRC}/tools/cling/tools/driver/cling.cpp post-install: for e in $$(cd ${STAGEDIR}${PREFIX}/llvm50_cern-root/bin && ls *); do \