From bf37808ef61cbd017179b3d92ad606bf31b14b80 Mon Sep 17 00:00:00 2001 From: Jacob Champion Date: Tue, 26 Aug 2025 14:28:05 -0700 Subject: [PATCH] oauth: Explicitly depend on -pthread Followup to 4e1e41733 and 52ecd05ae. oauth-utils.c uses pthread_sigmask(), requiring -pthread on Debian bullseye at minimum. Reported-by: Christoph Berg Tested-by: Christoph Berg Discussion: https://postgr.es/m/aK4PZgC0wuwQ5xSK%40msg.df7cb.de Backpatch-through: 18 --- meson.build | 1 + src/interfaces/libpq-oauth/Makefile | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 8e057d30a3d..52e21ce956f 100644 --- a/meson.build +++ b/meson.build @@ -3300,6 +3300,7 @@ libpq_deps += [ ] libpq_oauth_deps += [ + thread_dep, libcurl, ] diff --git a/src/interfaces/libpq-oauth/Makefile b/src/interfaces/libpq-oauth/Makefile index 8819fa8650e..71cd1829720 100644 --- a/src/interfaces/libpq-oauth/Makefile +++ b/src/interfaces/libpq-oauth/Makefile @@ -25,6 +25,7 @@ override shlib := lib$(NAME)$(DLSUFFIX) override stlib := libpq-oauth.a override CPPFLAGS := -I$(libpq_srcdir) -I$(top_builddir)/src/port $(CPPFLAGS) $(LIBCURL_CPPFLAGS) +override CFLAGS += $(PTHREAD_CFLAGS) OBJS = \ $(WIN32RES) @@ -47,7 +48,7 @@ $(stlib): override OBJS += $(OBJS_STATIC) $(stlib): $(OBJS_STATIC) SHLIB_LINK_INTERNAL = $(libpq_pgport_shlib) -SHLIB_LINK = $(LIBCURL_LDFLAGS) $(LIBCURL_LDLIBS) $(filter -lintl -lm, $(LIBS)) +SHLIB_LINK = $(LIBCURL_LDFLAGS) $(LIBCURL_LDLIBS) $(filter -lintl -lm $(PTHREAD_LIBS), $(LIBS)) SHLIB_PREREQS = submake-libpq SHLIB_EXPORTS = exports.txt