From nobody Tue May 07 05:51:41 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 4VYS8F35GZz5K487; Tue, 07 May 2024 05:51:41 +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 4VYS8F2Gnxz49WN; Tue, 7 May 2024 05:51:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715061101; 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=RAmJ/nLSP83+28tiI+xDuegXwhb6Y54klAvBQ6NAwqE=; b=wI+qrNC//fcA+4EOAQjSQWMyXnVOBRb7NPPvXjai7kuhysjfVSwE6LyRb2Vpsh0yHP6VMC HCfQdMQQPz4ghWKmmJqd4BawBMiQ/errDLn92TZuKwIlYuB4YeAcxUZZry1AxWPuaCx/4f RCobpFK6QLvdXT8XKUlC5tbn60g8GPcBVHKLDm4qerk4baOyortCHjoiM1+Kl3Kc8KoOhp Q/QYDz5tcH2pHjE4HjBLjlDGcDBuvMhJEiwrycRYxTK/93AE1g8PABT0XmzCtpJ8aPCcwP /AWzc1VFjlcdfaQkBBqTxKoW2XbSO+1j+646TrVUMMc2qCMmvdrVu/rTKqBgNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715061101; a=rsa-sha256; cv=none; b=gScZbbrqV7+pG8L5BgcMYuNLsFX0V29U7LqFMftdjx5rjXCcwu6xyFC0gS6T/omF9MwVQD Akud0SOHXJ+WL3tRPfkfjKjDhESBOeqrhnpHgml0tsmCOBtH+0ctygAmNF0pp50P61p2Ji RpaopA3b39KGEu/qTvf3FrRdOJzcBWP6xwT5xNVRl5nUaXo9fs5l1vxBLvsOKCRBbnp1TO MgZdLcOD1CLoBApA11fXyyyZ4xoHZSz+s0fRMPl1WjxNMAqG3EEUN9qrwI114zi4r467Kq TG9TqSqQp6QQYg2E6FR5pqFge1sO/ubSSUqemWugEiEJ8Ngb/VRkkk5HllWXuQ== 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=1715061101; 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=RAmJ/nLSP83+28tiI+xDuegXwhb6Y54klAvBQ6NAwqE=; b=Na/kgX6okWd9UWGBMLR1nkJ+N2NEEIzOmY2uXgSx2DxyP7dQX0dpuNvxhoOY4pO1swmFeZ a6bcjGDyLsePBFVuGtNem8XPkuhCOMyoN8Z1KK1jG52Jbdsl/m1lonXVw7yR5/raI1ZRwE vNDGdjwRwvzND+3R5ane4kp+NlSwWNI1Z7snNXlZYFRbF3I5c+geJYnLGGcCDkAcymUv2R 6u1SO4xap0j2/i3EJQJYNi4F9T/q2kjZnJGQCSCWXyMmDJpuJLAhNUH5pL3mvKMYE9K/xW D/hWU8YdCZHNB6GBEneHYrIPYWqEqSDDhK1cQnOSea3/yy2M1ko1EN3jBM1T8A== 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 4VYS8F1t7KzTCg; Tue, 7 May 2024 05:51:41 +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 4475pfic011342; Tue, 7 May 2024 05:51:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4475pfwF011340; Tue, 7 May 2024 05:51:41 GMT (envelope-from git) Date: Tue, 7 May 2024 05:51:41 GMT Message-Id: <202405070551.4475pfwF011340@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: 78a29f61b9f3 - main - emulators/wine: 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: 78a29f61b9f34f96a7138c42440cc060098f9dbf Auto-Submitted: auto-generated The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=78a29f61b9f34f96a7138c42440cc060098f9dbf commit 78a29f61b9f34f96a7138c42440cc060098f9dbf Author: Alexander Vereeken AuthorDate: 2024-05-07 05:50:47 +0000 Commit: Gerald Pfeifer CommitDate: 2024-05-07 05:50:48 +0000 emulators/wine: Refine WoW64 32-bit ABI determination PR: 278525 Reported by: Eduardo C. Reviewed by: Alex S --- emulators/wine/Makefile | 1 + emulators/wine/files/pkg32.sh | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index fa6ede914aab..f4e6d8dd9ecf 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -1,5 +1,6 @@ PORTNAME= wine DISTVERSION= 9.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= https://dl.winehq.org/wine/source/9.0/ diff --git a/emulators/wine/files/pkg32.sh b/emulators/wine/files/pkg32.sh index d75422997e12..64d82459c219 100644 --- a/emulators/wine/files/pkg32.sh +++ b/emulators/wine/files/pkg32.sh @@ -14,7 +14,6 @@ then ln -s /usr/share/keys/pkg "$I386_ROOT/usr/share/keys/pkg" fi -ABI=$(pkg config ABI | sed s/amd64/i386/) # Show what we're going to do, then do it. -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" "$@" +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" "$@"