From nobody Fri Nov 22 16:31:24 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 4Xw0wY08Fkz5f5RX; Fri, 22 Nov 2024 16:31:25 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xw0wX6qN6z4450; Fri, 22 Nov 2024 16:31:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732293085; 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=bPifEkrzmZ+LjiABVISdp/i7yn8Q22sfrYKjKi0s6Bo=; b=weUl/vQHwc6kPIOQxWjSHWpZD293gKkilZz/N682Bd/LCGgPgboeyksbdhSC2d6/rBMUZ9 KqzLshD0OFBG/PQMRGlqjqHqwRiYpwmZKmntSLfqZvoLyL6FBasGf9yZ+W4QoJGuL4bjuH 3I+Gh9eA9rXM/+twkJVFSsjb5bp3p5fnvW4RISbxcMXONNJ8v3YsUm+lmhIQrH/DdSAzLz R9URGWOSpYZmyanXJ1D6XJBxm08kklbOemuU5jw5kdRvIed+YFIMJOXRNHK79oKBeCtxHM ew22vE01W4gw10DxY0cl7j1T9gGvJfgBXtFsl9s+IM3ijhU7k8qr7RhRfVLlTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732293085; 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=bPifEkrzmZ+LjiABVISdp/i7yn8Q22sfrYKjKi0s6Bo=; b=IH7ybcgpC0YmorX7pkItitL5BKIXSUkhMdl1XxiqCusxJiV8OA8TTGtL/WNp2QcWw97KRp 9L/RE5kW4tsoqCZNkpPFXSV9W5LIr3xk4LgDbsanToRH26cmh5fEADvJoor4iLlPjsoqwx 6AWnQ9fEUv5BPaIdNS/EPigXibMcRiGVh/sHgOpse+3hzdCNOKhyfXRfdXoUeBInIDsLG2 gTJFWQdJK+D7M8Wb6wx4txgrixmf7/xCh/D/luwykuqYfYqKUiTZ72j4MRZhkqf5l3kC2/ 4jURYySkTgHaJ3s7K2fI2W31Fvh9s4crvyJRXLxlhvqst7Gl6yIpxwJyCgMQjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732293085; a=rsa-sha256; cv=none; b=ZriNpC99gm8L95nvzsdyDDhd0yCvK2VWDFSf99v8dG1ciVxwdnZH9d/T+k0ODBGGiRNUVU QdO7sjQaz4WjYpjIAX1GIoCXjPqQmKE7d5mxXZ33T5dI3zMgxDGV+xJtsuMs5s31BcsV0/ UvmKZMO0fGghjR5rAl0wRzK58NIFxViVBlev0rd2OVkj+1QE8gYqeDPNNwCoj+N4KG8duc ugbR1BSJNO7cUe8vGimFdI2BggPb8f0dkC3bsZ3kFh9mDi7aA0K8D8A5E8jUWYY2mOvnkd YV2Mh70xK1dWpBxxNZG1UY7hfne1qTXQeupJQvK4toSi/6Ka1arB/A7yrtHlqA== 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 4Xw0wX66hGzXQJ; Fri, 22 Nov 2024 16:31:24 +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 4AMGVOgm042313; Fri, 22 Nov 2024 16:31:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AMGVOgD042310; Fri, 22 Nov 2024 16:31:24 GMT (envelope-from git) Date: Fri, 22 Nov 2024 16:31:24 GMT Message-Id: <202411221631.4AMGVOgD042310@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 85b72a5454c5 - main - Revert "devel/wasi-libc: chase missed _DEPENDS line changes after flavourisation" 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: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 85b72a5454c5bdcc850e153b66fdaa4e83e84f3d Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=85b72a5454c5bdcc850e153b66fdaa4e83e84f3d commit 85b72a5454c5bdcc850e153b66fdaa4e83e84f3d Author: Vladimir Druzenko AuthorDate: 2024-11-22 16:27:24 +0000 Commit: Vladimir Druzenko 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