From: Devrim Gunduz Date: Tue, 28 Oct 2025 09:04:16 +0000 (+0300) Subject: mongo_fdw: Add json-c to SHLIB_LINK, per reminder from Christoph X-Git-Url: http://git.postgresql.org/gitweb/static/%22display.php?a=commitdiff_plain;h=1b5db0b65442f8ff9c437b687dc658b1d929f578;p=pgrpms.git mongo_fdw: Add json-c to SHLIB_LINK, per reminder from Christoph --- diff --git a/rpm/redhat/main/non-common/mongo_fdw/main/mongo_fdw-makefile-rpm.patch b/rpm/redhat/main/non-common/mongo_fdw/main/mongo_fdw-makefile-rpm.patch index 93202cb36..dc6c5b7ca 100644 --- a/rpm/redhat/main/non-common/mongo_fdw/main/mongo_fdw-makefile-rpm.patch +++ b/rpm/redhat/main/non-common/mongo_fdw/main/mongo_fdw-makefile-rpm.patch @@ -1,6 +1,6 @@ ---- Makefile.old 2025-10-28 11:14:11.952389716 +0300 -+++ Makefile 2025-10-28 11:14:26.381469823 +0300 -@@ -11,10 +11,10 @@ +--- Makefile.old 2025-10-28 12:02:11.257852584 +0300 ++++ Makefile 2025-10-28 12:02:39.576373419 +0300 +@@ -11,14 +11,9 @@ # on another platform, change env_posix.os in MONGO_OBJS with the appropriate # environment object file. # @@ -8,10 +8,11 @@ -LIBJSON_OBJS = $(LIBJSON)/json_util.o $(LIBJSON)/json_object.o $(LIBJSON)/json_tokener.o \ - $(LIBJSON)/json_object_iterator.o $(LIBJSON)/printbuf.o $(LIBJSON)/linkhash.o \ - $(LIBJSON)/arraylist.o $(LIBJSON)/random_seed.o $(LIBJSON)/debug.o $(LIBJSON)/strerror_override.o -+#LIBJSON = json-c -+#LIBJSON_OBJS = $(LIBJSON)/json_util.o $(LIBJSON)/json_object.o $(LIBJSON)/json_tokener.o \ -+# $(LIBJSON)/json_object_iterator.o $(LIBJSON)/printbuf.o $(LIBJSON)/linkhash.o \ -+# $(LIBJSON)/arraylist.o $(LIBJSON)/random_seed.o $(LIBJSON)/debug.o $(LIBJSON)/strerror_override.o - +- MONGO_INCLUDE = $(shell pkg-config --cflags libmongoc-1.0) PG_CPPFLAGS = --std=c99 $(MONGO_INCLUDE) -I$(LIBJSON) +-SHLIB_LINK = $(shell pkg-config --libs libmongoc-1.0) ++SHLIB_LINK = $(shell pkg-config --libs libmongoc-1.0 json-c) + + OBJS = connection.o option.o mongo_wrapper.o mongo_fdw.o mongo_query.o deparse.o $(LIBJSON_OBJS) +