From nobody Thu Dec 30 13:26:24 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 C41E4192902D; Thu, 30 Dec 2021 13:26:24 +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 4JPpvN2C7wz3PK9; Thu, 30 Dec 2021 13:26:24 +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 273DE194A7; Thu, 30 Dec 2021 13:26:24 +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 1BUDQOfj037701; Thu, 30 Dec 2021 13:26:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BUDQOD1037700; Thu, 30 Dec 2021 13:26:24 GMT (envelope-from git) Date: Thu, 30 Dec 2021 13:26:24 GMT Message-Id: <202112301326.1BUDQOD1037700@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: 9b46ada11cb6 - main - emulators/wine-proton: 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: 9b46ada11cb643d07d33cd5ce10ae155fbcd0e3e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640870784; 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=F+9qlTtNMOcUerGQjkP82419v2U2GbuSK/G71GoaXwA=; b=dlaVVlBPSJGzyS/RrVGEX2bAoSPI/LoqlouogtM6IdCI885nFtnFI0bfsZqnqwoww3Nrdj zB8a+fICyw7sMYpFo367j4faFR9phSoe5dKsZQBpqkeN44SXGzGAkQSbSYMDp9OTVOAIfF AMonNwfttCqxFol1xRx+x5CgovZX5u7gTAC17DUCVHRP+bYnZXBXn8MnlHzkCXLtlg93yh E63l/QDrR6pDPVP8hxi+VlgzfGMgn95vSstyCXMgMUOWGvvnVpDWCwqFEzwt1FrHy/p2hj 4tj7+70fta3MZ+fVuU0T3J4NoT74et/2J2xvRGM5n4GLeCOE1neBvVAmWFlYkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640870784; a=rsa-sha256; cv=none; b=QZUuAQFRA/JodF+42pu4WqeSF5YCqFniBxZBDL4ZcjpSKoQrxgxNq5PfHfwyH8lsIJUgMG L51qF8zQYOPtyv7iswDoPToOctmJNH1nvcCD1G4tbvlofeJfhv0EDm9G924xfFng3WUJaR tFG0YhKQsgBKpQXxSDqfxin2HeKHujIumPMPDchoA3ipseNXGLJRbSKoBmfEEwqQ9lhvMe peWm3CsihuY2lvGF8xUMDAm6ffNVZ2XxUmVLk5Tdo27uC0mQnbwIOcMVWRSvNdbGHTGPif NaVge9FLr8iFYtsQid/xQehwMd93TRe9G+czexW0A9C902spAz00dXEaNuURlA== 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=9b46ada11cb643d07d33cd5ce10ae155fbcd0e3e commit 9b46ada11cb643d07d33cd5ce10ae155fbcd0e3e Author: Gerald Pfeifer AuthorDate: 2021-12-30 11:32:47 +0000 Commit: Gerald Pfeifer CommitDate: 2021-12-30 13:23:15 +0000 emulators/wine-proton: Fix build with devel/libsysinfo present Port b75f3b5a79927f27605bee328c36d9d7d8b425ec from emulators/wine: 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: 260792 Requested by: iwtcex@gmail.com (maintainer) Submitted by: Patrick Mackinlay --- emulators/wine-proton/files/patch-sysinfo | 72 +++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/emulators/wine-proton/files/patch-sysinfo b/emulators/wine-proton/files/patch-sysinfo new file mode 100644 index 000000000000..5021b5c2a045 --- /dev/null +++ b/emulators/wine-proton/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