Date: Sun, 17 Jul 2022 17:01:00 GMT From: =?utf-8?Q?Stefan=20E=C3=9Fer?= <se@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 973550dd663c - main - Revert "devel/wasi-compiler-rt14: add new port" Message-ID: <202207171701.26HH10PP074399@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=973550dd663c6d36f57ff425e52ed26d7ed257c2 commit 973550dd663c6d36f57ff425e52ed26d7ed257c2 Author: Stefan Eßer <se@FreeBSD.org> AuthorDate: 2022-07-17 16:53:55 +0000 Commit: Stefan Eßer <se@FreeBSD.org> CommitDate: 2022-07-17 17:00:27 +0000 Revert "devel/wasi-compiler-rt14: add new port" Charlie Li <vishwin@freebsd.org> requests a revert of the addition of this port, since it needs updates to wase-libc and wasi-libc++ to be used. The support for LLVM-14 has been worked on since May of 2022, with a number of unresolved issues remaining (see reviews D35286 to D35389). The "make index" breakage for LLVM_DEFAULT=14 has been dealt with by enforcing use of LLVM-13 for www/firefox (in commit 6b2cf7d799d). This reverts commit febcdcce6160c7203722afca2c226aeac531c1e6. --- devel/Makefile | 1 - devel/wasi-compiler-rt14/Makefile | 59 -------------------------------------- devel/wasi-compiler-rt14/distinfo | 3 -- devel/wasi-compiler-rt14/pkg-descr | 7 ----- 4 files changed, 70 deletions(-) diff --git a/devel/Makefile b/devel/Makefile index 94183264a354..90750a0c477e 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -7267,7 +7267,6 @@ SUBDIR += wandio SUBDIR += wasi-compiler-rt11 SUBDIR += wasi-compiler-rt13 - SUBDIR += wasi-compiler-rt14 SUBDIR += wasi-libc SUBDIR += wasi-libcxx SUBDIR += wasm3 diff --git a/devel/wasi-compiler-rt14/Makefile b/devel/wasi-compiler-rt14/Makefile deleted file mode 100644 index ac08e5e750d4..000000000000 --- a/devel/wasi-compiler-rt14/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -PORTNAME= compiler-rt -DISTVERSION= 14.0.6 -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} -PKGNAMEPREFIX= wasi- -PKGNAMESUFFIX= ${LLVM_SUFFIX} -DISTNAME= llvm-project-${DISTVERSION}.src -DISTFILES= llvm-project-${DISTVERSION}.src${EXTRACT_SUFX} - -MAINTAINER= greg@unrelenting.technology -COMMENT= Clang builtins library for WebAssembly System Interface - -LICENSE= LLVM2 -LICENSE_FILE= ${WRKSRC}/llvm/LICENSE.TXT -LICENSE_NAME= Apache License 2.0 with LLVM Exceptions -LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept - -LLVM_RELEASE= ${DISTVERSION:C/rc.*//} -LLVM_SUFFIX= ${LLVM_RELEASE:C/\.[0-9]\.[0-9]$//} -LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} - -WASI_SYSROOT= ${LOCALBASE}/share/wasi-sysroot - -BUILD_DEPENDS= ${WASI_SYSROOT}/include/stdarg.h:devel/wasi-libc \ - clang${LLVM_SUFFIX}:devel/llvm${LLVM_SUFFIX} - -USES= cmake tar:xz -NO_ARCH= yes - -PLIST_FILES= llvm${LLVM_SUFFIX}/lib/clang/${LLVM_RELEASE}/lib/wasi/libclang_rt.builtins-wasm32.a - -CC= ${LOCALBASE}/bin/clang${LLVM_SUFFIX} -CXX= ${LOCALBASE}/bin/clang++${LLVM_SUFFIX} - -CMAKE_SOURCE_PATH= ${WRKSRC}/compiler-rt/lib/builtins -CMAKE_INSTALL_PREFIX= ${LLVM_PREFIX}/lib/clang/${LLVM_RELEASE} -CMAKE_ARGS= -DCMAKE_C_COMPILER_WORKS=1 \ - -DCMAKE_SYSROOT=${WASI_SYSROOT} \ - -DLLVM_CONFIG_PATH=${LOCALBASE}/bin/llvm-config${LLVM_SUFFIX} \ - -DCOMPILER_RT_OS_DIR=wasi \ - -DCOMPILER_RT_BAREMETAL_BUILD=TRUE \ - -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=wasm32-wasi \ - -DCOMPILER_RT_EXCLUDE_ATOMIC_BUILTIN=TRUE \ - -DCOMPILER_RT_HAS_FPIC_FLAG:BOOL=ON \ - -DCOMPILER_RT_HAS_FPIE_FLAG:BOOL=ON \ - -DCOMPILER_RT_HAS_FNO_BUILTIN_FLAG:BOOL=ON \ - -DCOMPILER_RT_HAS_STD_C11_FLAG:BOOL=ON \ - -DCOMPILER_RT_HAS_VISIBILITY_HIDDEN_FLAG:BOOL=ON \ - -DCOMPILER_RT_HAS_FREESTANDING_FLAG:BOOL=ON \ - -DCOMPILER_RT_HAS_XRAY_COMPILER_FLAG:BOOL=OFF \ - -DCOMPILER_RT_HAS_ATOMIC_KEYWORD:BOOL=ON \ - -DCOMPILER_RT_HAS_FLOAT16:BOOL=OFF \ - -DCOMPILER_RT_HAS_ASM_LSE:BOOL=OFF - -post-build: - ${LOCALBASE}/bin/llvm-ranlib${LLVM_SUFFIX} ${CONFIGURE_WRKSRC}/lib/wasi/*.a - -.include <bsd.port.mk> diff --git a/devel/wasi-compiler-rt14/distinfo b/devel/wasi-compiler-rt14/distinfo deleted file mode 100644 index 7419e65832bf..000000000000 --- a/devel/wasi-compiler-rt14/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1657924837 -SHA256 (llvm-project-14.0.6.src.tar.xz) = 8b3cfd7bc695bd6cea0f37f53f0981f34f87496e79e2529874fd03a2f9dd3a8a -SIZE (llvm-project-14.0.6.src.tar.xz) = 105618228 diff --git a/devel/wasi-compiler-rt14/pkg-descr b/devel/wasi-compiler-rt14/pkg-descr deleted file mode 100644 index 9f4dbd2d452c..000000000000 --- a/devel/wasi-compiler-rt14/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -The LLVM Project is a collection of modular and reusable compiler and -toolchain technologies. - -This port includes Clang builtins for WASI -(WebAssembly System Interface). - -WWW: http://llvm.org/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202207171701.26HH10PP074399>