git: 78a29f61b9f3 - main - emulators/wine: Refine WoW64 32-bit ABI determination
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 07 May 2024 05:51:41 UTC
The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=78a29f61b9f34f96a7138c42440cc060098f9dbf commit 78a29f61b9f34f96a7138c42440cc060098f9dbf Author: Alexander Vereeken <Alexander88207@protonmail.com> AuthorDate: 2024-05-07 05:50:47 +0000 Commit: Gerald Pfeifer <gerald@FreeBSD.org> CommitDate: 2024-05-07 05:50:48 +0000 emulators/wine: Refine WoW64 32-bit ABI determination PR: 278525 Reported by: Eduardo C. <idude0407@gmail.com> Reviewed by: Alex S <iwtcex@gmail.com> --- 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" "$@"