From 7fffb5b4df4b60c8c36b76062333ed22e6c79148 Mon Sep 17 00:00:00 2001 From: Erik Grinaker Date: Thu, 26 Jun 2025 12:33:39 +0200 Subject: [PATCH 1/3] pgxn/neon: fix macOS build --- pgxn/neon/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pgxn/neon/Makefile b/pgxn/neon/Makefile index bf7aeb4108..f3053c2c76 100644 --- a/pgxn/neon/Makefile +++ b/pgxn/neon/Makefile @@ -5,6 +5,7 @@ MODULE_big = neon OBJS = \ $(WIN32RES) \ communicator.o \ + communicator_new.o \ extension_server.o \ file_cache.o \ hll.o \ @@ -29,6 +30,11 @@ PG_CPPFLAGS = -I$(libpq_srcdir) SHLIB_LINK_INTERNAL = $(libpq) SHLIB_LINK = -lcurl +UNAME_S := $(shell uname -s) +ifeq ($(shell uname), Darwin) + SHLIB_LINK += -framework Security -framework CoreFoundation -framework SystemConfiguration +endif + EXTENSION = neon DATA = \ neon--1.0.sql \ From d08e5538358cf7663554c6860182af647303336b Mon Sep 17 00:00:00 2001 From: Erik Grinaker Date: Thu, 26 Jun 2025 12:33:59 +0200 Subject: [PATCH 2/3] pgxn/neon: fix `callback_get_request_lsn_unsafe` return type --- pgxn/neon/communicator_new.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pgxn/neon/communicator_new.c b/pgxn/neon/communicator_new.c index d64e30af96..51a3358bae 100644 --- a/pgxn/neon/communicator_new.c +++ b/pgxn/neon/communicator_new.c @@ -344,7 +344,7 @@ callback_set_my_latch_unsafe(void) * FIXME: The logic from neon_get_request_lsns() needs to go here, except for * the last-written LSN cache stuff, which is managed by the rust code now. */ -uint64 +uint64_t callback_get_request_lsn_unsafe(void) { /* From e3ecdfbeccbb7d09575e7be3da4975af4c3619bd Mon Sep 17 00:00:00 2001 From: Erik Grinaker Date: Thu, 26 Jun 2025 12:38:44 +0200 Subject: [PATCH 3/3] pgxn/neon: actually use UNAME_S --- pgxn/neon/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pgxn/neon/Makefile b/pgxn/neon/Makefile index f3053c2c76..9d9c2f34b6 100644 --- a/pgxn/neon/Makefile +++ b/pgxn/neon/Makefile @@ -31,7 +31,7 @@ SHLIB_LINK_INTERNAL = $(libpq) SHLIB_LINK = -lcurl UNAME_S := $(shell uname -s) -ifeq ($(shell uname), Darwin) +ifeq ($(UNAME_S), Darwin) SHLIB_LINK += -framework Security -framework CoreFoundation -framework SystemConfiguration endif