From nobody Mon May 06 09:21:25 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 4VXwrj5HBlz5Jlpt; Mon, 06 May 2024 09:21:25 +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 4VXwrj4Y38z53fl; Mon, 6 May 2024 09:21:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714987285; 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=lmyWFJX6FGYp+d3uc8PgFytgeIwJeZPh0/7ivpQqDNE=; b=a5mwTeueh52TZNQp2ekqH9N1wQyeTNe6LMTTuwqNiVlUhhExwG7LMxZYmT+C7EB2/rdIKb ShSfbC+Vkte/1J21PBgutOAIynax2kuOJ1JEQfH6Mt/f8TnFyfCYc1XGX3g//0utAAKWEI pEFjnqvi/ZFzNgkNvjTbVrWPYKDfvFy6ssoRijWObFHGBsbv+6Tzs3KTu5Mna6ddC5MXQE Xonc2qr6Siyr/hmtIJKsEExmPe61NOAMqfcrv1et6nUNds/0eEU4a0ARj0Z7bs5sO8KyVA D5J7x6LSJT3mdDfbmPucTtkfJ08xRhz779E+lpnr86H5OTCAqdyco7m7UqZJuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714987285; a=rsa-sha256; cv=none; b=IPlsxyxDFaInbRKlfYHkcj7L6mlpoPMrNMWrqYfAlBCHCOURKYty93QdTcpIVGrxPCG9Z3 GFHsIDBFuoRHH/nMwpI2+KWoztocFKTQy0FvqQ+Y0/vwiLaVwpcNlJYjCGRXrqpdKcpfs1 EkziR4uY8rnnxeN5vMOUcHFXzzTd/AtXqksLxEd56NGehZjes4L0bpr3EaRVqt5BzsVnc3 y6QoX4/bg4tViW2wdyeOFwaNnG5sIhoLINiJgn0DUIinK1hNr9bEGCAhiCDqMEhQOstIGy rfyeFRmrNj0LI7HvI3v4dY9bf3tdQVQ5zaaUnhTn45/jxG4sDvmqHuchxG7gRA== 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=1714987285; 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=lmyWFJX6FGYp+d3uc8PgFytgeIwJeZPh0/7ivpQqDNE=; b=YSk4kF1X726X9mRRtaESO3zwyuyKXT+T5ZXOc3UmIGmBrw4r7ME8dm6W64La09U8vsslPu mxJAAiZI3+FcuRpcTpUqVZYqZrjd5+nd77PevL1uhhCT1nEDQiBs9cw8GCVfkuzWGtp8f2 yDy8lSS4ls0BtoCmEItOWYFMTo/GT05rmaqH4maRbGn9XbY9IIuHDRiUPLkToJZf1bUF1j jDGCoGkD8x/3ttMDCxWnqCXzcojzplP5C7MAOI1B/9lZtH/enH8c90+rMe5AF9rZhPNwfg ILDHOM+rHqZ/rdIXDC0XqPGPcQVqgP7Xt4ZaVyvpqaCmOE44MNytxTN4oULl4Q== 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 4VXwrj48M7zs9F; Mon, 6 May 2024 09:21:25 +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 4469LPGx025654; Mon, 6 May 2024 09:21:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4469LPXt025651; Mon, 6 May 2024 09:21:25 GMT (envelope-from git) Date: Mon, 6 May 2024 09:21:25 GMT Message-Id: <202405060921.4469LPXt025651@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: 8d60603b7558 - main - emulators/wine8: 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: 8d60603b7558af3635f2b9b96e61e7a613b77e64 Auto-Submitted: auto-generated The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=8d60603b7558af3635f2b9b96e61e7a613b77e64 commit 8d60603b7558af3635f2b9b96e61e7a613b77e64 Author: Alexander Vereeken AuthorDate: 2024-05-05 19:15:19 +0000 Commit: Gerald Pfeifer CommitDate: 2024-05-06 09:20:58 +0000 emulators/wine8: Refine WoW64 32-bit ABI determination PR: 278525 Reported by: Eduardo C. --- emulators/wine8/Makefile | 2 +- emulators/wine8/files/pkg32.sh | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/emulators/wine8/Makefile b/emulators/wine8/Makefile index 7d4a44135519..97fa767d38df 100644 --- a/emulators/wine8/Makefile +++ b/emulators/wine8/Makefile @@ -1,6 +1,6 @@ PORTNAME= wine DISTVERSION= 8.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= https://dl.winehq.org/wine/source/8.0/ PKGNAMESUFFIX= 8 diff --git a/emulators/wine8/files/pkg32.sh b/emulators/wine8/files/pkg32.sh index d75422997e12..64d82459c219 100644 --- a/emulators/wine8/files/pkg32.sh +++ b/emulators/wine8/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" "$@"