summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Champion <jchampion@postgresql.org>2025-08-26 14:16:31 -0700
committerJacob Champion <jchampion@postgresql.org>2025-08-26 14:16:31 -0700
commit85b380162cd6c66752d1dd020a2d9700da0903c9 (patch)
treeb1709ebe3d338719b178a26ee8dfa23471f59328
parente567e22290544c57293f8e5a913292dacd3bcd1a (diff)
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 <myon@debian.org> Tested-by: Christoph Berg <myon@debian.org> Discussion: https://postgr.es/m/aK4PZgC0wuwQ5xSK%40msg.df7cb.de Backpatch-through: 18
-rw-r--r--meson.build1
-rw-r--r--src/interfaces/libpq-oauth/Makefile3
2 files changed, 3 insertions, 1 deletions
diff --git a/meson.build b/meson.build
index 3aaa37be920..ab8101d67b2 100644
--- a/meson.build
+++ b/meson.build
@@ -3287,6 +3287,7 @@ libpq_deps += [
]
libpq_oauth_deps += [
+ thread_dep,
libcurl,
]
diff --git a/src/interfaces/libpq-oauth/Makefile b/src/interfaces/libpq-oauth/Makefile
index c8c38947ace..51145f085a8 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