From nobody Sat Dec 11 19:26:28 2021 X-Original-To: dev-commits-ports-all@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 32B3F18D22A9; Sat, 11 Dec 2021 19:26:29 +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 4JBHnc6TZHz4xhh; Sat, 11 Dec 2021 19:26:28 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 BF50613D80; Sat, 11 Dec 2021 19:26:28 +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 1BBJQSJK039796; Sat, 11 Dec 2021 19:26:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BBJQSJr039795; Sat, 11 Dec 2021 19:26:28 GMT (envelope-from git) Date: Sat, 11 Dec 2021 19:26:28 GMT Message-Id: <202112111926.1BBJQSJr039795@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: 6344ed87cd08 - main - emulators/wine-devel: Use the right libgcc_s for 32-bit on amd64 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 6344ed87cd08032ea97adf3982fea383e7f73436 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639250788; 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=wGZ/O6dCmgK59m6lfyH5sFsnrsAqP78ND1Mob9bVJNU=; b=HICA94uO05xDBN7AhmUNc5xIAWMZ7vc3Dxs+2a0pFZIhY7Or/0Lr01y45upJAbBrnBL9uy Z8iLyUeKO5hxXkDs1gOKDfLn/1KGc94f+VH59cTrwwjMk0Fs+hPlf9LLkY0uNrCJPfAK85 LmiNOrEEoW5luDMI2J49+UkMtgX3ml0vgoeFnlDGD2i33r2nEdg5Im9pA3YXgRIjd1eRT5 LFQBiepuMwX1uAcFn3YAwVZSB9E7LltxFepTjrxzaHo3DMF7eHfnGbJ44g/bX8u5YNiPoK IEw1d5oWR81FyqWEOZFSj8VsgQ2t84aN0zzomnjqwY4vmAoClrTdsPndxsH26Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639250788; a=rsa-sha256; cv=none; b=GPdcKgWajv7cHTGFKWoO1IF6ACkm9sHsaEH4p3jeP2VOYjCNyGO9JJL9PHqqiboArhqYri /B/V9050bCL7TXMIbqSoeYbiUEHbJdgWuQmae0nqyP/P/PEUy8pUdBOK/NInBHFNLy/MhO VaWla7RM3anUkpJ53XbR5EGaiczaOlOahYRAX9ZYDpWAPks0hbbWlNht+nWSwPqUmOCKJA MnV5jDpT1bcohhyxrFCny/vIHH+crWc3xAWTMxbKWctjs5UEH/+dDL8j0OBm+FUs2NFu32 5AF1u8yuXZYuIKvY3jpDcMJrSQFKpgFwn8bwBiDNLm7qcQhD4QLKuthkQRsJYw== 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=6344ed87cd08032ea97adf3982fea383e7f73436 commit 6344ed87cd08032ea97adf3982fea383e7f73436 Author: Alex S AuthorDate: 2021-12-11 19:25:53 +0000 Commit: Gerald Pfeifer CommitDate: 2021-12-11 19:25:53 +0000 emulators/wine-devel: Use the right libgcc_s for 32-bit on amd64 Forward port 316c372c7d133c416ced0bd6b1f21fdd011117eb from the main wine port: In our situation, where we leverage 32-bit, i386 executables of Wine in an amd64 world running 64-bit executables of Wine, the rpath of $PREFIX/lib/gcc10 which Mk/bsd.gcc.mk sets for the former makes the dynamic linker attempt to load a 64-bit version of libgcc_s.so which happens to be at that location on amd64. Removing this rpath setting at compilation time would be comparatively more involved, so leverage LD_32_LIBMAP which we are already using in wine-wow64.sh to point to the system version of libgcc_s.so. This works since for C code both flavors of libgcc_s.so are fully compatible and Wine's C++ dependencies Wine (like openal-soft and various Mesa userspace graphics drivers) are actually compiled with clang. In other words we are only reverting to the version of the library they would normally load without rpath interference. Bump PORTREVISION so new packages with the tweaked script will be generated. PR: 259926 Reported by: nc Tested by: nc --- emulators/wine-devel/Makefile | 1 + emulators/wine-devel/files/wine-wow64.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 2d1b3a6f103b..57ebc56d8530 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -2,6 +2,7 @@ PORTNAME= wine DISTVERSION= 6.23 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ diff --git a/emulators/wine-devel/files/wine-wow64.sh b/emulators/wine-devel/files/wine-wow64.sh index 3a3ea25bb4c5..d83d10db698e 100644 --- a/emulators/wine-devel/files/wine-wow64.sh +++ b/emulators/wine-devel/files/wine-wow64.sh @@ -33,6 +33,7 @@ do done export LD_32_LIBRARY_PATH_RPATH=y export LD_32_LIBMAP=" +libgcc_s.so.1 /usr/lib32/libgcc_s.so.1 $LOCALBASE/lib/libvulkan_intel.so $I386_ROOT/$LOCALBASE/lib/libvulkan_intel.so $LOCALBASE/lib/libvulkan_radeon.so $I386_ROOT/$LOCALBASE/lib/libvulkan_radeon.so $LD_32_LIBMAP"