From nobody Sun Dec 5 19:46:13 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 A1E1018B1E60; Sun, 5 Dec 2021 19:46:14 +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 4J6cWB1ppJz4sPH; Sun, 5 Dec 2021 19:46:14 +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 0F8BB1DFE2; Sun, 5 Dec 2021 19:46:14 +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 1B5JkDjQ010731; Sun, 5 Dec 2021 19:46:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B5JkDjr010730; Sun, 5 Dec 2021 19:46:13 GMT (envelope-from git) Date: Sun, 5 Dec 2021 19:46:13 GMT Message-Id: <202112051946.1B5JkDjr010730@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: 316c372c7d13 - main - emulators/wine: 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: 316c372c7d133c416ced0bd6b1f21fdd011117eb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638733574; 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=x9MvJu5jVkZp0ac43ZKtrEL6T8yINn1UZt57NJeFmrU=; b=dL0lq6txLFFlfr5I0fYVlzLRsGM3f6L6dkrUBcNot5uK8/ndisbX9xDxSgcoCXAj+03syc IwTG2jpbiuQulSUX1jqEjCTyDy4KFpMSG5x7L83y4J84bcs8RmiX3gfDouS7V2GGkdnd3K yKJfXG6SjQJOQTvua+unPSdY0W2kNFOq/2EUtfLVCCxxxORuMeDqS6Fw5zKAQpxz638U1j qWeEX92s4WXAmqXKdYpSsMo8DiwUrBAL4/wVwxy6R6gr1BIMyLFNQirFDhafCnm0nqQ0EM LT03O7qcLa0C/9s0RicJma5eGmeGwohdoeok3kohh2HlunHpD7GylsO+z4vL5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638733574; a=rsa-sha256; cv=none; b=BXxpE1LbjnZ3SsCxOLXDUrym94+QuU7cAVOnDH32cqZw2HWRayCCDRNDSg44sWJaFwJRci ERu8Xu5L+Lhqlai8N5T5jP87fcys3/uyNo8LOzNlo3JlIP0B680gLHtRcw1Wte37i6evPn f6auFc1sOX6jn38N5OYCqi+zOn9KavxyEoiefEAGm145BjjA38biyNxDR4dwezvXboKRjB +IxcZiP8LmlVd3IWKCYrN3YNT/kYv8P8QwjJZ0OY8XbYPkJ/SC5ri3nVL68W1jxhbakzzo 8S1XBUtjWR9SWCeDmjv8orDAZ+2lGW2TutXWAzt82zw4bOLqBQ3JSFDOvX9zpw== 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=316c372c7d133c416ced0bd6b1f21fdd011117eb commit 316c372c7d133c416ced0bd6b1f21fdd011117eb Author: Alex S AuthorDate: 2021-12-05 19:22:04 +0000 Commit: Gerald Pfeifer CommitDate: 2021-12-05 19:45:31 +0000 emulators/wine: Use the right libgcc_s for 32-bit on amd64 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/Makefile | 1 + emulators/wine/files/wine-wow64.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index fadb124d1105..2a7caa14db94 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -2,6 +2,7 @@ PORTNAME= wine DISTVERSION= 6.0.2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ diff --git a/emulators/wine/files/wine-wow64.sh b/emulators/wine/files/wine-wow64.sh index a7b1efba17cc..2ec4cc31703e 100644 --- a/emulators/wine/files/wine-wow64.sh +++ b/emulators/wine/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"