From nobody Wed Apr 19 19:49:23 2023 X-Original-To: dev-commits-src-main@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 4Q1rw469Lmz46NSD; Wed, 19 Apr 2023 19:49:24 +0000 (UTC) (envelope-from hselasky@freebsd.org) Received: from mail.turbocat.net (turbocat.net [88.99.82.50]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4Q1rw413k2z4DjK; Wed, 19 Apr 2023 19:49:24 +0000 (UTC) (envelope-from hselasky@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: from [10.36.2.154] (unknown [46.212.121.255]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id BE8DE26010F; Wed, 19 Apr 2023 21:49:22 +0200 (CEST) Message-ID: Date: Wed, 19 Apr 2023 21:49:23 +0200 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: git: 8dcf3a82c54c - main - libc: Implement bsort(3) a bitonic type of sorting algorithm. Content-Language: en-US To: Charlie Li , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202304191206.33JC6Qcp062380@gitrepo.freebsd.org> From: Hans Petter Selasky In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4Q1rw413k2z4DjK X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:24940, ipnet:88.99.0.0/16, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 4/19/23 21:07, Charlie Li wrote: > Hans Petter Selasky wrote: > This causes ports to fail, so far with Python's configure phase and any > Python ports with C extensions: > > In file included from /usr/local/include/python3.11/Python.h:23: > /usr/include/stdlib.h:409:1: error: unknown type name 'errno_t' > errno_t  bsort_s(void *, rsize_t, rsize_t, > ^ > /usr/include/stdlib.h:409:35: error: redefinition of parameter 'rsize_t' > errno_t  bsort_s(void *, rsize_t, rsize_t, >                                   ^ > /usr/include/stdlib.h:409:26: note: previous declaration is here > errno_t  bsort_s(void *, rsize_t, rsize_t, >                          ^ > 2 errors generated. > Hi Charlie, The following patch should fix it. I'm just kicking a buildworld to ensure nothing else is broken. Will push this once that is complete. > From ed6a0aaa839086cfe2037989fc8feb3ac864be63 Mon Sep 17 00:00:00 2001 > From: Hans Petter Selasky > Date: Wed, 19 Apr 2023 21:37:29 +0200 > Subject: [PATCH] libc: bsort_s() requires both __BSD_VISIBLE and > __EXT1_VISIBLE > > Fixes build of Python. > > Found by: vishwin@ > MFC after: 1 week > Sponsored by: NVIDIA Networking > Differential Revision: https://reviews.freebsd.org/D36493 > --- > include/stdlib.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/stdlib.h b/include/stdlib.h > index 857092b9053e..3ad28cf68847 100644 > --- a/include/stdlib.h > +++ b/include/stdlib.h > @@ -403,12 +403,12 @@ void ignore_handler_s(const char * __restrict, void * __restrict, errno_t); > /* K.3.6.3.2 */ > errno_t qsort_s(void *, rsize_t, rsize_t, > int (*)(const void *, const void *, void *), void *); > -#endif /* __EXT1_VISIBLE */ > > #if __BSD_VISIBLE > errno_t bsort_s(void *, rsize_t, rsize_t, > int (*)(const void *, const void *, void *), void *); > #endif /* __BSD_VISIBLE */ > +#endif /* __EXT1_VISIBLE */ > > __END_DECLS > __NULLABILITY_PRAGMA_POP > -- > 2.40.0 --HPS