From 6bc346173514c1e1f3c373990c1f48260e66e1a1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Apr 2022 23:57:52 +0200 Subject: [PATCH] package/postgresql: fix build without NPTL Fix the following build failure without NPTL raised since bump to version 14.1 in commit c9bd02911565819789120370178e82da5dfbacc0 and https://github.com/postgres/postgres/commit/44bf3d5083e151d772c5d6f656e3e162f573dced: In file included from pthread_barrier_wait.c:16: ../../src/include/port/pg_pthread.h:31:3: error: conflicting types for 'pthread_barrier_t' 31 | } pthread_barrier_t; | ^~~~~~~~~~~~~~~~~ In file included from /home/autobuild/autobuild/instance-11/output-1/host/arc-buildroot-linux-uclibc/sysroot/usr/include/bits/uClibc_stdio.h:114, from /home/autobuild/autobuild/instance-11/output-1/host/arc-buildroot-linux-uclibc/sysroot/usr/include/stdio.h:71, from ../../src/include/c.h:59, from pthread_barrier_wait.c:14: /home/autobuild/autobuild/instance-11/output-1/host/arc-buildroot-linux-uclibc/sysroot/usr/include/bits/pthreadtypes.h:135:3: note: previous declaration of 'pthread_barrier_t' was here 135 | } pthread_barrier_t; | ^~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/70acbe121236ef0905c4466d4f7a0839723d2c49 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/postgresql/postgresql.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index c389246f80..1dfb20b58d 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -38,7 +38,7 @@ ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) POSTGRESQL_CONF_ENV += pgac_cv_type_locale_t=no endif -ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +ifneq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),y) POSTGRESQL_CONF_OPTS += --disable-thread-safety endif