Attachment 229856 Details for Bug 260186 – 0001-devel-wasi-compiler-rt-predefine-test-results-should.patch

[patch] 0001-devel-wasi-compiler-rt-predefine-test-results-should.patch

0001-devel-wasi-compiler-rt-predefine-test-results-should.patch (text/plain), 7.82 KB, created by Val Packett on 2021-12-03 08:46:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Val Packett

Created: 2021-12-03 08:46:57 UTC

Size: 7.82 KB

patch

obsolete

>From e471fdd31ea1eba81c57bad87d6e8af59e2a858a Mon Sep 17 00:00:00 2001
>From: Greg V <greg@unrelenting.technology>
>Date: Fri, 3 Dec 2021 11:43:44 +0300
>Subject: [PATCH] devel/wasi-compiler-rt*: predefine test results (should fix
> build on aarch64)
>
>---
> devel/wasi-compiler-rt11/Makefile | 12 +++++++++++-
> devel/wasi-compiler-rt12/Makefile | 12 +++++++++++-
> devel/wasi-compiler-rt13/Makefile | 12 +++++++++++-
> 3 files changed, 33 insertions(+), 3 deletions(-)
>
>diff --git a/devel/wasi-compiler-rt11/Makefile b/devel/wasi-compiler-rt11/Makefile
>index d0a1733d74f7..5ff422fc8d32 100644
>--- a/devel/wasi-compiler-rt11/Makefile
>+++ b/devel/wasi-compiler-rt11/Makefile
>@@ -1,52 +1,62 @@
> PORTNAME=	compiler-rt
> DISTVERSION=	11.0.1
> CATEGORIES=	devel lang
> .if ${DISTVERSION:M*rc*}
> MASTER_SITES=	https://prereleases.llvm.org/${LLVM_RELEASE}/${RCDIR}
> .else
> MASTER_SITES=	https://releases.llvm.org/${LLVM_RELEASE}/
> .endif
> PKGNAMEPREFIX=	wasi-
> PKGNAMESUFFIX=	${LLVM_SUFFIX}
> DISTNAME=	${PORTNAME}-${DISTVERSION}.src
> DISTFILES=	${PORTNAME}-${DISTVERSION}.src${EXTRACT_SUFX}
> 
> MAINTAINER=	greg@unrelenting.technology
> COMMENT=	Clang builtins library for WebAssembly System Interface
> 
> LICENSE=	LLVM2
> LICENSE_FILE=	${WRKSRC}/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}/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_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-rt12/Makefile b/devel/wasi-compiler-rt12/Makefile
>index 531cf8c6e4a3..543102ccb723 100644
>--- a/devel/wasi-compiler-rt12/Makefile
>+++ b/devel/wasi-compiler-rt12/Makefile
>@@ -1,52 +1,62 @@
> PORTNAME=	compiler-rt
> DISTVERSION=	12.0.1
> 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=	cmt@FreeBSD.org
> 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
> 
> DEPRECATED=	this ports exists solely for building Firefox 95+ in 2021Q4
> EXPIRATION_DATE=2022-01-15
> 
> 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_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-rt13/Makefile b/devel/wasi-compiler-rt13/Makefile
>index 7a90a7c8f40b..392889bdd401 100644
>--- a/devel/wasi-compiler-rt13/Makefile
>+++ b/devel/wasi-compiler-rt13/Makefile
>@@ -1,49 +1,59 @@
> PORTNAME=	compiler-rt
> DISTVERSION=	13.0.0
> 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_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>
>-- 
>2.30.0
>

Flags:

val: maintainer-approval+

Actions: View | Diff

Attachments on bug 260186: 229856