From nobody Wed Dec 15 21:32:18 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 CADF418D5D80; Wed, 15 Dec 2021 21:32:18 +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 4JDpNy3z5gz4bMV; Wed, 15 Dec 2021 21:32:18 +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 6950123A33; Wed, 15 Dec 2021 21:32:18 +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 1BFLWIsY013756; Wed, 15 Dec 2021 21:32:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BFLWIhW013755; Wed, 15 Dec 2021 21:32:18 GMT (envelope-from git) Date: Wed, 15 Dec 2021 21:32:18 GMT Message-Id: <202112152132.1BFLWIhW013755@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: b75f3b5a7992 - main - emulators/wine: Fix build with devel/libsysinfo present 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: b75f3b5a79927f27605bee328c36d9d7d8b425ec Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639603938; 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=WskwAQxTbI+HVYBnF7ITyoQUR0+pNdG9zYgzarrKp6g=; b=ZjIvX0ecwW1dCdTFEKjJ22ki9HI1c8q7X51bEqfU5gvvGRFFRvJNfq9nG5v1BOj6pVGFlh S2ScQkQwhU7sVMogtfGpxFhRiCYkESvmG7++i86xZMOu872RtYAoU5nAB//e9nW5LSpMdw Kb0zza3cl/w0XyJOoTULbB+QjeFlIFE+oGdbBqB54cJH3Gcvy/RR+/bvDYQnnmtn1VNWJn VpewopMC19JOPe8X4iJfv1o6mANTfYq8H1mNo1GgZyGolRh1Cplx2loJkAMau9aBkzBqsa 6ZeuDu+odFXCHfGeebhT1N9aKwtYhTmNY0GISWrh4SpWEklCY2vLlws+UTVLEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639603938; a=rsa-sha256; cv=none; b=vwi5AZ/0c3iA4w3HXJKFb4IZYwtRN0aFLSOoAYI12coGTWIsWIieZXGOrXt3HkoDC9FBh/ yWjNU1MNTT2XUrUawzEpAnkTQ+9fpcGIeNSWeTkvNJc+Ztruq7NtfdUHJuucKoY1r1Cau+ 22Cf3Mq7HVyTVsFLTT5Z723nhyr2sEqjoBw1KholVThJAEPLilpGqKPJWtiW34hUvLM+Ii cZzbwJbirxXfOvZjCCsE0zO8zTMDDozOk15HjJX5da52D9uqb/0rcmAOm1i1OVZzvKzpd8 hrgcg+u2kedW+T4sVQoJTTelxas2tEdzkqVc2auSlpJ4k29H2SgrSyRyYBPRBQ== 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=b75f3b5a79927f27605bee328c36d9d7d8b425ec commit b75f3b5a79927f27605bee328c36d9d7d8b425ec Author: Gerald Pfeifer AuthorDate: 2021-12-15 21:27:50 +0000 Commit: Gerald Pfeifer CommitDate: 2021-12-15 21:31:35 +0000 emulators/wine: Fix build with devel/libsysinfo present This back ports the patch I pushed upstream and that wine-devel has inherited from there a few months ago. It will go away with the next major release. PR: 257398, 260165 [1] Suggested by: alt2600@icloud.com [1] --- emulators/wine/files/patch-sysinfo | 72 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/emulators/wine/files/patch-sysinfo b/emulators/wine/files/patch-sysinfo new file mode 100644 index 000000000000..5021b5c2a045 --- /dev/null +++ b/emulators/wine/files/patch-sysinfo @@ -0,0 +1,72 @@ +This is a back port of a patch to mainline Wine; it will be in the +next major version of Wine at which point we need to drop this patch. + +commit 59da79021a6e441e3b21b933c744aba922208ec1 +Author: Gerald Pfeifer +Date: Tue Aug 10 22:36:27 2021 +0200 + + ntdll: Only use sysinfo function when present. + + On some systems may be present while the sysinfo + function may not, or at least not as part of standard libraries, + so check whether the function is actually available before using + it. + + This fixes builds on FreeBSD with the devel/libsysinfo present. + + Signed-off-by: Gerald Pfeifer + Signed-off-by: Alexandre Julliard + +--- UTC +diff --git a/configure b/configure +index 1be0aa9d217..e8c1cb9e3a8 100755 +--- configure ++++ configure +@@ -18068,6 +18068,7 @@ for ac_func in \ + setprogname \ + sigprocmask \ + symlink \ ++ sysinfo \ + tcdrain \ + thr_kill2 + +diff --git a/configure.ac b/configure.ac +index 69e27147088..065b3f231bf 100644 +--- configure.ac ++++ configure.ac +@@ -2205,6 +2205,7 @@ AC_CHECK_FUNCS(\ + setprogname \ + sigprocmask \ + symlink \ ++ sysinfo \ + tcdrain \ + thr_kill2 + ) +diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c +index a252e25fbc6..2cca90ac952 100644 +--- dlls/ntdll/unix/virtual.c ++++ dlls/ntdll/unix/virtual.c +@@ -2737,7 +2737,8 @@ ULONG_PTR get_system_affinity_mask(void) + */ + void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info, BOOL wow64 ) + { +-#if defined(HAVE_STRUCT_SYSINFO_TOTALRAM) && defined(HAVE_STRUCT_SYSINFO_MEM_UNIT) ++#if defined(HAVE_SYSINFO) \ ++ && defined(HAVE_STRUCT_SYSINFO_TOTALRAM) && defined(HAVE_STRUCT_SYSINFO_MEM_UNIT) + struct sysinfo sinfo; + + if (!sysinfo(&sinfo)) +diff --git a/include/config.h.in b/include/config.h.in +index ad770281471..24f7b64ffd3 100644 +--- include/config.h.in ++++ include/config.h.in +@@ -744,6 +744,9 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_SYSCALL_H + ++/* Define to 1 if you have the `sysinfo' function. */ ++#undef HAVE_SYSINFO ++ + /* Define to 1 if you have the + header file. */ + #undef HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H