From owner-dev-commits-ports-all@freebsd.org Fri Sep 17 14:29:43 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C11F06B41EF; Fri, 17 Sep 2021 14:29:43 +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 4H9xDR4yVwz4nlB; Fri, 17 Sep 2021 14:29:43 +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 8543116922; Fri, 17 Sep 2021 14:29:43 +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 18HEThQD081522; Fri, 17 Sep 2021 14:29:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18HEThK6081521; Fri, 17 Sep 2021 14:29:43 GMT (envelope-from git) Date: Fri, 17 Sep 2021 14:29:43 GMT Message-Id: <202109171429.18HEThK6081521@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: 24336172a3e4 - main - emulators/wine-devel: Translate amd64 to x86_64 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: 24336172a3e441e40d9c9b4259b60b38928359ad Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Sep 2021 14:29:43 -0000 The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=24336172a3e441e40d9c9b4259b60b38928359ad commit 24336172a3e441e40d9c9b4259b60b38928359ad Author: Gerald Pfeifer AuthorDate: 2021-09-17 14:26:55 +0000 Commit: Gerald Pfeifer CommitDate: 2021-09-17 14:29:25 +0000 emulators/wine-devel: Translate amd64 to x86_64 In a02e3c6686d68350132a88379fc3d99445b9b80d we translated amd64 to x86-64, which is the marketing name, alas we need to use x86_64, the technical name used on the GNU universe (and by Wine). What a difference underscore vs dash makes. --- emulators/wine-devel/Makefile | 2 +- emulators/wine-devel/files/patch-amd64-vs-x86-64 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 7b1f2ea32179..ae303d246de5 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -150,7 +150,7 @@ X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ # --libdir is required since Wine defaults to "${PREFIX}/lib64" on amd64. CONFIGURE_ARGS+= --enable-win64 --libdir=${PREFIX}/lib -PLIST_SUB+= WINE32="@comment " WINE64="" WINEARCH="x86-64" +PLIST_SUB+= WINE32="@comment " WINE64="" WINEARCH="x86_64" # Wine assumes a WoW64 package is available, which is not the case on # FreeBSD yet. diff --git a/emulators/wine-devel/files/patch-amd64-vs-x86-64 b/emulators/wine-devel/files/patch-amd64-vs-x86-64 index d20d34baca1b..36865ce7979c 100644 --- a/emulators/wine-devel/files/patch-amd64-vs-x86-64 +++ b/emulators/wine-devel/files/patch-amd64-vs-x86-64 @@ -5,13 +5,13 @@ index 59857762edd..ed7a58ed1f9 100644 if (!man_ext) man_ext = "3w"; if (arch) { -+ /* For historic reasons FreeBSD calls x86-64 by the name of amd64 ++ /* For historic reasons FreeBSD calls x86_64 by the name of amd64 + * and features a variable ARCH with that value in the environment + * when building ports. This breaks Wine in interesting ways, so + * revert to the industry standard name when we enouncter amd64. + */ + if ( !strcmp(arch,"amd64") ) -+ arch = "x86-64"; ++ arch = "x86_64"; so_dir = strmake( "$(dlldir)/%s-unix", arch ); pe_dir = strmake( "$(dlldir)/%s-windows", arch ); }