Date: Fri, 22 Nov 2024 16:31:24 GMT From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 85b72a5454c5 - main - Revert "devel/wasi-libc: chase missed _DEPENDS line changes after flavourisation" Message-ID: <202411221631.4AMGVOgD042310@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=85b72a5454c5bdcc850e153b66fdaa4e83e84f3d commit 85b72a5454c5bdcc850e153b66fdaa4e83e84f3d Author: Vladimir Druzenko <vvd@FreeBSD.org> AuthorDate: 2024-11-22 16:27:24 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2024-11-22 16:27:24 +0000 Revert "devel/wasi-libc: chase missed _DEPENDS line changes after flavourisation" Flavorization of the devel/wasi-libc was not MFH. This reverts commit 0c538aad8a8708a074157b767459360aa09398f0. --- mail/thunderbird/Makefile | 2 +- www/firefox-esr/Makefile | 2 +- www/firefox/Makefile | 2 +- www/librewolf/Makefile | 2 +- www/tor-browser/Makefile | 2 +- www/waterfox/Makefile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 091de88fde7f..aa3a7baeca84 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -54,7 +54,7 @@ OPTIONS_DEFAULT=CANBERRA MOZ_OPTIONS+= --without-wasm-sandboxed-libraries .else BUILD_DEPENDS+= ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \ - ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc@${LLVM_VERSION} \ + ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc \ wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION} MOZ_OPTIONS+= --with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot .endif diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index 1153707e9d42..c3f8ad4fda7e 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -50,7 +50,7 @@ MOZ_OPTIONS= --enable-application=browser \ MOZ_OPTIONS+= --without-wasm-sandboxed-libraries .else BUILD_DEPENDS+= ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \ - ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc@${LLVM_VERSION} \ + ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc \ wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION} MOZ_OPTIONS+= --with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot .endif diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 75bb9b33f37d..5d8439be2268 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -52,7 +52,7 @@ MOZ_OPTIONS= --enable-application=browser \ MOZ_OPTIONS+= --without-wasm-sandboxed-libraries .else BUILD_DEPENDS+= ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \ - ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc@${LLVM_VERSION} \ + ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc \ wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION} MOZ_OPTIONS+= --with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot .endif diff --git a/www/librewolf/Makefile b/www/librewolf/Makefile index 6a6430a14ce5..950c5e537e68 100644 --- a/www/librewolf/Makefile +++ b/www/librewolf/Makefile @@ -79,7 +79,7 @@ CFLAGS+= -DHWY_COMPILE_ONLY_SCALAR MOZ_OPTIONS+= --without-wasm-sandboxed-libraries .else BUILD_DEPENDS+= ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \ - ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc@${LLVM_VERSION} \ + ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc \ wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION} MOZ_OPTIONS+= --with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot .endif diff --git a/www/tor-browser/Makefile b/www/tor-browser/Makefile index f6602f46f5a0..60d04d36d09a 100644 --- a/www/tor-browser/Makefile +++ b/www/tor-browser/Makefile @@ -103,7 +103,7 @@ MOZ_OPTIONS+= --enable-rust-simd MOZ_OPTIONS+= --without-wasm-sandboxed-libraries .else BUILD_DEPENDS+= ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \ - ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc@${LLVM_VERSION} \ + ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc \ wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION} MOZILLA_PLIST_DIRS= bin lib share/applications share/pixmaps \ share/tor-browser diff --git a/www/waterfox/Makefile b/www/waterfox/Makefile index d2bbdd37ec8e..b8ef0075984d 100644 --- a/www/waterfox/Makefile +++ b/www/waterfox/Makefile @@ -84,7 +84,7 @@ CFLAGS+= -DHWY_COMPILE_ONLY_SCALAR MOZ_OPTIONS+= --without-wasm-sandboxed-libraries .else BUILD_DEPENDS+= ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \ - ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc@${LLVM_VERSION} \ + ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc \ wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION} MOZ_OPTIONS+= --with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411221631.4AMGVOgD042310>