From nobody Tue Feb 1 07:32:51 2022 X-Original-To: dev-commits-ports-all@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 ABB5019881DD; Tue, 1 Feb 2022 07:32:51 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JnxVC4Q8Yz3DWC; Tue, 1 Feb 2022 07:32:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643700771; 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=PU84OLooSJWB51KC62HFcB0R8/eF11QS/dORdVk3mpo=; b=Q+xHClApEBHdE2Nq13njbF+KTUEL72pHJ7CmWfQLYaGi4p8L7fMijoUv3JERo11F4sMbIR bhY2GKOArhEAxs/BL32BEvBIegNYndO9kCA3Td7NxMHkojEqe/w6tmy+VLxjXaB1WXrdGB lV3taEG2Wf3FHVOjwuN2gpZRBHlm2AK3bH2+vSfkOldJ1Ek20cY5j5KcfRXp7KEuTrq5IO 9nPp4sptrVXqkOFRC0xYnd4IzAv7bfb5G56EaubJT7FTxUOfqAZZ7wJWj0tAwZO3/Z8KbS /JMb6KxkQN5SMUoH4PSr15ropmtXD/dYaKwHkdUStKZ20QNAR9wEr01PQ6ULHw== 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 77D8A4542; Tue, 1 Feb 2022 07:32:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2117Wp6G022184; Tue, 1 Feb 2022 07:32:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2117WpAh022183; Tue, 1 Feb 2022 07:32:51 GMT (envelope-from git) Date: Tue, 1 Feb 2022 07:32:51 GMT Message-Id: <202202010732.2117WpAh022183@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gerald Pfeifer Subject: git: 9dc3d307de26 - main - emulators/wine: Add a note on Poudriere in the WoW case List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9dc3d307de26ebb3ee31859fed8cc9dbc779dff5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643700771; 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=PU84OLooSJWB51KC62HFcB0R8/eF11QS/dORdVk3mpo=; b=GGRx8cSH74smuT4pIc1QlsJ/7n5wdzoexQazw0NUhPz7Ye1EWoUVOXbBRQStKwC/Rh4QQ+ 3EpND1w2pY1xgtQeiI2EnpqA2mGqYTlsK5D21iMf7QaFmvBJR6X5aGyXgELs/b7iEem/Fn RWGaJA4fEnRovNkKQ5W4KF7NqTS7AsjYN631nZd8YBNZB7aM334Vfz8Ct8EzKob+9+DfCj Puv6SbEy1Gh06fW+acSKCGq5Cth6MYlgH8nqJytZy/aoVRDACf+OZNa3qutL8TTzyM4tO0 3Rf9RR7Ug5wA0RtcdO6egihZroAmziZLjG4Twggwg3lr5cwh13fJpHTApfPGXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643700771; a=rsa-sha256; cv=none; b=agtoPYY7fEIfP25hgNT0BS2HzyP2i0vnk79KBNcf5ery7Ci1FPnCQNmX4CL4bdrTejONLy CMq+Y3HTPGfiM3y1DCLuXU/t2kIxrintvkRgqwzwyfFJcdEmm+1UE8Y9Kb0O/i/S5LyZJ5 L0weAk6oR+Fmok5nnIRFeqDkB4c2rHU3ZAAWxNzLRjK5q2LQGkoeAGeaWmAz4oSbljFgOV CxABODL0KDxEdqlrh+tAr7z7fv2yr/M7NpiqxZTlfesAsXYJtCC1F5HCmQZe0761uUkkaE 0YHa85JCwxAvnCAUAauP4Fq7OqKn+5KyIB2c2Znilnqsxt2ScL8XO+zOGQtRzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=9dc3d307de26ebb3ee31859fed8cc9dbc779dff5 commit 9dc3d307de26ebb3ee31859fed8cc9dbc779dff5 Author: Gerald Pfeifer AuthorDate: 2022-02-01 07:18:04 +0000 Commit: Gerald Pfeifer CommitDate: 2022-02-01 07:32:13 +0000 emulators/wine: Add a note on Poudriere in the WoW case PR: 260407 Reported by: Zane C. Bowers-Hadley --- emulators/wine/files/wine-wow64.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/emulators/wine/files/wine-wow64.sh b/emulators/wine/files/wine-wow64.sh index 2ec4cc31703e..796f26787c8c 100644 --- a/emulators/wine/files/wine-wow64.sh +++ b/emulators/wine/files/wine-wow64.sh @@ -10,6 +10,16 @@ if [ ! -f "$I386_ROOT/$PREFIX/bin/wine" ] then printf "%s doesn't exist!\n\n" "$I386_ROOT/$PREFIX/bin/wine" printf "Try installing 32-bit Wine with\n\t%s\n" "$PREFIX/share/wine/pkg32.sh install wine mesa-dri" + ABI=$(pkg config ABI | sed s/amd64/i386/) + FREEBSD_VERSION_MAJOR=`uname -r | sed "s/\..*//"` + cat <<- HERE + + If using Poudriere, please make sure your repo is setup to use ${ABI} + and create symlinks for + FreeBSD:$FREEBSD_VERSION_MAJOR:amd64 and + FreeBSD:$FREEBSD_VERSION_MAJOR:i386 + to the relevant output directories. See pkg.conf(5) for more info. +HERE exit 1 fi