From owner-dev-commits-ports-main@freebsd.org Tue Sep 7 09:43:19 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 150D96AF678; Tue, 7 Sep 2021 09:43:19 +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 4H3gLZ5mD2z3Dc6; Tue, 7 Sep 2021 09:43: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 A6A9210537; Tue, 7 Sep 2021 09:43: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 1879hIuV097058; Tue, 7 Sep 2021 09:43:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1879hIcT097057; Tue, 7 Sep 2021 09:43:18 GMT (envelope-from git) Date: Tue, 7 Sep 2021 09:43:18 GMT Message-Id: <202109070943.1879hIcT097057@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: ee394fe49a84 - main - databases/iowow: unbreak the build on FreeBSD 11.x MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee394fe49a846f91d97d258bbcdb5d8d78179c87 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Sep 2021 09:43:19 -0000 The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=ee394fe49a846f91d97d258bbcdb5d8d78179c87 commit ee394fe49a846f91d97d258bbcdb5d8d78179c87 Author: Alexey Dokuchaev AuthorDate: 2021-09-07 09:42:18 +0000 Commit: Alexey Dokuchaev CommitDate: 2021-09-07 09:42:20 +0000 databases/iowow: unbreak the build on FreeBSD 11.x Unfortunately, pthread_setname_np() is not available there, so use the older pthread_set_name_np() for the time being. Reported by: pkg-fallout --- databases/iowow/files/patch-src_platform_unix_unix.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/databases/iowow/files/patch-src_platform_unix_unix.c b/databases/iowow/files/patch-src_platform_unix_unix.c index 62529cbc5fe4..6910201ce373 100644 --- a/databases/iowow/files/patch-src_platform_unix_unix.c +++ b/databases/iowow/files/patch-src_platform_unix_unix.c @@ -1,6 +1,6 @@ ---- src/platform/unix/unix.c.orig 2018-05-19 14:09:04 UTC +--- src/platform/unix/unix.c.orig 2021-09-03 09:03:05 UTC +++ src/platform/unix/unix.c -@@ -314,7 +314,7 @@ iwrc iwp_fdatasync(HANDLE fh) { +@@ -355,7 +355,7 @@ iwrc iwp_fdatasync(HANDLE fh) { if (fcntl(fh, F_FULLFSYNC) == -1) { return iwrc_set_errno(IW_ERROR_IO_ERRNO, errno); } @@ -8,4 +8,15 @@ +#elif defined(__FreeBSD_version) && __FreeBSD_version > 1100501 if (fdatasync(fh) == -1) { return iwrc_set_errno(IW_ERROR_IO_ERRNO, errno); - } + } +@@ -384,6 +384,10 @@ void iwp_set_current_thread_name(const char *name) { + + #if defined(__linux__) + prctl(PR_SET_NAME, name); ++#elif defined(__FreeBSD__) ++ // We're using even more non-standard pthread_set_name_np() here ++ // because pthread_setname_np() is not available on FreeBSD 11.X. ++ pthread_set_name_np(pthread_self(), name); + #elif defined(__NetBSD__) + rv = pthread_setname_np(pthread_self(), "%s", (void*) name); + #elif defined(__APPLE__)