From nobody Sun May 5 19:12:52 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 4VXZ1c2QX9z5KX3n; Sun, 05 May 2024 19:12:52 +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 4VXZ1c1h0wz4LZb; Sun, 5 May 2024 19:12:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714936372; 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=NsW52Ak3aUnjjJUMLooFmwsRg2zejjaoIa2f0KY1Pgs=; b=VqBVh9Hqj/ipH72QI6JqJ+tr/YNXmcT8ImFWN28n7myOIG+H/g11RWPOgRYyTFOj6xIT3G yjR2pTI7bN/oJgK0wV9Ss5gpdonmGPKmniZt0zeh9RT6adULQGveJEPE7psrIfvLEVpfHQ lQanPSOM7q/3AMB8iHHaoAbWktSM+rTBoksx6G05dDoX9VtkjHp31MhgQRFgsLuPCCtpMZ YWkTPPvpVapPWvlKHbChHWp0GTVa74b/1eufFAeAXriw5R29QHgRLkZLomdODvF0vEQO1k K0K9AI7Ej+ZeiX2OkS7kB5jUimc6db9+/uZspoFP2oSw6+s7EcXPZmG7QCcpKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714936372; a=rsa-sha256; cv=none; b=G1/j3dUod3/bdAdIDckcxpWQdL+HLMbjV/wzkPW7ZzgninZB3VM9oa5EZG7wYClGdRg+5X MrzueCwVY1XUmN3JztT0WVUW9HivoV3UTx/8xnOuo39e2JNRPJNwziJh0ZKErExeeTEkaD lfrTak/RP43sD2JPl3DXNg8tO3MuSIk7JsuxPm2M19vS930WPaAaBke0V0vTv9da9F/xs0 uHI9jb7MhD6kINlYigSegsN+6yWWa8eveg1cNSsNxeKRZlzxAcdO9gGwjjR81v2va9P1da 1tvQ3H4rGQ6a+6IRXPXn1eVagoT/J+8QLCFdBErdU06+pevOPRY/chPhgBeRgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714936372; 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=NsW52Ak3aUnjjJUMLooFmwsRg2zejjaoIa2f0KY1Pgs=; b=QbNprWEV7jy7cnZquqZbDU/VF6FrocDv6NOPvGW/OjiVhOuGPVPW4y+3DruIMz8WlVpcWL 2SZCWJsWvpYY2OsiG6VlEpCQphgEv4lK+nfX/KfhzaV3Drt0JSMy9a6qLNHLFrLT1mWsS4 stJqnj8AOadAoYo8wuX49c7D8aFQbpinmKwmac6Fpi5V+LNCv2QxTzIL3eEpC6jZi/F8qP tquGMWabkzbiVl+fFMlI5OIDGDUOZDCROTW1E/6mJ/LDqvWIQITw+xsBzoyYmkSL3v0+Cv sVzzgWONLkCiE29SoCc/gMyAVQaI8FY1Xcak87iHIzcdpIKaZ0oIjSfU9gu8JQ== 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 4VXZ1c1HkyzQjC; Sun, 5 May 2024 19:12:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 445JCqrM085529; Sun, 5 May 2024 19:12:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 445JCqU5085526; Sun, 5 May 2024 19:12:52 GMT (envelope-from git) Date: Sun, 5 May 2024 19:12:52 GMT Message-Id: <202405051912.445JCqU5085526@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: 3b0b9249b5c1 - main - emulators/wine-proton: Refine WoW64 32-bit ABI determination 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: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b0b9249b5c1a920c53f828ed51e73a0a638c24e Auto-Submitted: auto-generated The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=3b0b9249b5c1a920c53f828ed51e73a0a638c24e commit 3b0b9249b5c1a920c53f828ed51e73a0a638c24e Author: Alexander Vereeken AuthorDate: 2024-05-05 19:11:39 +0000 Commit: Gerald Pfeifer CommitDate: 2024-05-05 19:12:25 +0000 emulators/wine-proton: Refine WoW64 32-bit ABI determination PR: 278525 Reported by: Eduardo C. Approved by: Alex S (maintainer) --- emulators/wine-proton/Makefile | 2 +- emulators/wine-proton/files/pkg32.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/emulators/wine-proton/Makefile b/emulators/wine-proton/Makefile index 0d6cc6af9321..ff22204d38cc 100644 --- a/emulators/wine-proton/Makefile +++ b/emulators/wine-proton/Makefile @@ -1,6 +1,6 @@ PORTNAME= wine-proton DISTVERSION= 8.0-5 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= emulators MAINTAINER= iwtcex@gmail.com diff --git a/emulators/wine-proton/files/pkg32.sh b/emulators/wine-proton/files/pkg32.sh index 6e87ee27add3..64d82459c219 100644 --- a/emulators/wine-proton/files/pkg32.sh +++ b/emulators/wine-proton/files/pkg32.sh @@ -14,6 +14,6 @@ then ln -s /usr/share/keys/pkg "$I386_ROOT/usr/share/keys/pkg" fi -ABI=$(pkg config ABI | sed s/amd64/i386/) -echo pkg -o ABI="$ABI" -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@" -exec pkg -o ABI="$ABI" -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@" +# Show what we're going to do, then do it. +echo pkg -o ABI_FILE=/usr/lib32/libc.so.7 -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@" +exec pkg -o ABI_FILE=/usr/lib32/libc.so.7 -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@"