From nobody Sat Mar 12 09:12:39 2022 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 A99E91A25F38; Sat, 12 Mar 2022 09:12:39 +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 4KFxsM4CPyz4fmB; Sat, 12 Mar 2022 09:12:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647076359; 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=UAfagQXm0Yp6eRiua39ZuYOZzeb4vELSE4jb+1u0Abc=; b=nxTWgRpPjwMvUACeW/dgkSN02NP7Dh145KPmH3us1KL9JLcOknBg8h8/hIUYeEFZN5/RCN DF3WbtMapKlOxCZ3DAaVkOTnfPDnCAfVeHWp6BIE+RrsorAAWJXCjavu9gYiQVOkKPeEY2 5kJtb4SonoW+6YoQJ6Cn9KHZOreBpUN9vNYQY+Vz0keDs2t8AoTLvrylnyBtijNjSCOJz4 wikDXBBN6k4YOk6yOVd8i7i2VogdYd8wRCVXr/fVedBtk70DlbXPcNx1Crszl8RXho0pnt 9q5FGO4Ysxr6bZ9pQtJSLOOs0A+PQZJz3ogBiERHR5JH7AI5N3jrK6MwjM4snQ== 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 705AC29E64; Sat, 12 Mar 2022 09:12:39 +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 22C9Cdf0027553; Sat, 12 Mar 2022 09:12:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22C9CdlH027552; Sat, 12 Mar 2022 09:12:39 GMT (envelope-from git) Date: Sat, 12 Mar 2022 09:12:39 GMT Message-Id: <202203120912.22C9CdlH027552@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: 3f914243d817 - main - emulators/wine-devel: Add a note on Poudriere in the WoW case 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 3f914243d8179e0d1606c7d00ee2eb3498d0bb62 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647076359; 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=UAfagQXm0Yp6eRiua39ZuYOZzeb4vELSE4jb+1u0Abc=; b=Y96Ooa3Au5obeM5ESx/PDE1abfLD4su/RSfKwAVMKted6KUB/MaMYZeUH+i05HFbXF29Hp Tl1HJLG5dyND8fNX91yaYVYCqyLuXeDdDrz981tim/Ho75/nmlYUKWlJBZVlVrNP1pOISs 9r1EVnZCxitjoxH+UMCRr1MoXNnT1YaTD540j6cv2LvH0Caj76wRpeY0Xap0cyKBQb98o4 8tMLwk4Yepg+BF1LOOCyT61wsUk731fudhX/xRpWHw7FcHU53ERtipUzjWXIfwHY9MAtaH ZhI5TzRVDASchLalgE5HWoSX8HV/yzlKbMrWPBUesgvl4bog8CMrWAPwmuK8AQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647076359; a=rsa-sha256; cv=none; b=YZsfjMIilYKKmqnm/rwZQIHSuNxBcFKNkDV1gdyyR85utC0AytpbN9cnzd6xVJJbEigO8p JCoouEA6VQjQ1NV8O5Xxs9WO1X1fY+2ZLl1RjPE64cpHFqEGmcVHQnHdxy3gW690+5T+sA LgMkzlSi9fbB3HYeh/PTDeC1/rrbRyhi3tIBOZ/qW2h0JnAZignUD4/X55XksyfWjrqk0U n8Sn2e17pZTOZExPC7kiGl900orb01sDwxCMCXk4EtSvWUfSlAaWmL8wUb547NE+dm1bES Fed5CDVOYOh3F8iiaS4cvbr6dEhkJq+xx0TPnOlroZuYd3iLOIaFYsw+l7rMsw== 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=3f914243d8179e0d1606c7d00ee2eb3498d0bb62 commit 3f914243d8179e0d1606c7d00ee2eb3498d0bb62 Author: Gerald Pfeifer AuthorDate: 2022-03-12 09:10:49 +0000 Commit: Gerald Pfeifer CommitDate: 2022-03-12 09:10:49 +0000 emulators/wine-devel: Add a note on Poudriere in the WoW case This forward ports commit 9dc3d307de26ebb3ee31859fed8cc9dbc779dff5 from emulators/wine. PR: 260407 Reported by: Zane C. Bowers-Hadley Approved by: maintainer --- emulators/wine-devel/files/wine-wow64.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/emulators/wine-devel/files/wine-wow64.sh b/emulators/wine-devel/files/wine-wow64.sh index d83d10db698e..796f26787c8c 100644 --- a/emulators/wine-devel/files/wine-wow64.sh +++ b/emulators/wine-devel/files/wine-wow64.sh @@ -9,7 +9,17 @@ I386_ROOT="${WINE_i386_ROOT:-$HOME/.i386-wine-pkg}" 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-devel mesa-dri" + 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