Skip to content

Commit 85b3801

Browse files
committed
oauth: Explicitly depend on -pthread
Followup to 4e1e417 and 52ecd05. oauth-utils.c uses pthread_sigmask(), requiring -pthread on Debian bullseye at minimum. Reported-by: Christoph Berg <[email protected]> Tested-by: Christoph Berg <[email protected]> Discussion: https://postgr.es/m/aK4PZgC0wuwQ5xSK%40msg.df7cb.de Backpatch-through: 18
1 parent e567e22 commit 85b3801

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

meson.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3287,6 +3287,7 @@ libpq_deps += [
32873287
]
32883288

32893289
libpq_oauth_deps += [
3290+
thread_dep,
32903291
libcurl,
32913292
]
32923293

src/interfaces/libpq-oauth/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ override shlib := lib$(NAME)$(DLSUFFIX)
2525
override stlib := libpq-oauth.a
2626

2727
override CPPFLAGS := -I$(libpq_srcdir) -I$(top_builddir)/src/port $(CPPFLAGS) $(LIBCURL_CPPFLAGS)
28+
override CFLAGS += $(PTHREAD_CFLAGS)
2829

2930
OBJS = \
3031
$(WIN32RES)
@@ -47,7 +48,7 @@ $(stlib): override OBJS += $(OBJS_STATIC)
4748
$(stlib): $(OBJS_STATIC)
4849

4950
SHLIB_LINK_INTERNAL = $(libpq_pgport_shlib)
50-
SHLIB_LINK = $(LIBCURL_LDFLAGS) $(LIBCURL_LDLIBS) $(filter -lintl -lm, $(LIBS))
51+
SHLIB_LINK = $(LIBCURL_LDFLAGS) $(LIBCURL_LDLIBS) $(filter -lintl -lm $(PTHREAD_LIBS), $(LIBS))
5152
SHLIB_PREREQS = submake-libpq
5253
SHLIB_EXPORTS = exports.txt
5354

0 commit comments

Comments
 (0)