Up to 14.0.0.

[packages/postgresql.git] / postgresql-link.patch

diff --git a/postgresql-link.patch b/postgresql-link.patch
index 98cfb56c45944cfe260df5079f119634a228fa65..193e4805705c6d661580e8e9e08b1c83bd8d6239 100644 (file)
--- a/postgresql-link.patch
+++ b/postgresql-link.patch
@@ -1,36 +1,42 @@
---- postgresql-7.4beta1/configure.in.orig      2003-08-05 00:30:30.000000000 +0200
-+++ postgresql-7.4beta1/configure.in   2003-08-09 08:01:18.000000000 +0200
-@@ -614,12 +614,13 @@
+diff -urNp -x '*.orig' postgresql-12.4.org/configure.ac postgresql-12.4/configure.ac
+--- postgresql-12.4.org/configure.ac   2021-11-09 09:31:36.707897270 +0100
++++ postgresql-12.4/configure.ac       2021-11-09 09:31:40.651435766 +0100
+@@ -1470,6 +1470,7 @@ fi
  
- if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha"
- then
--      AC_CHECK_LIB(bsd,      main)
-+:
-+dnl   AC_CHECK_LIB(bsd,      main)
+ if test "$with_bonjour" = yes ; then
+   AC_CHECK_HEADER(dns_sd.h, [], [AC_MSG_ERROR([header file <dns_sd.h> is required for Bonjour])])
++  AC_CHECK_LIB(dns_sd, DNSServiceRegister, [BONJOUR_LIBS=-ldns_sd])
+ dnl At some point we might add something like
+ dnl AC_SEARCH_LIBS(DNSServiceRegister, dns_sd)
+ dnl but right now, what that would mainly accomplish is to encourage
+@@ -1477,6 +1478,7 @@ dnl people to try to use the avahi imple
+ dnl If you want to use Apple's own Bonjour code on another platform,
+ dnl just add -ldns_sd to LIBS manually.
  fi
- AC_CHECK_LIB(util,     setproctitle)
- AC_CHECK_LIB(m,        main)
- AC_CHECK_LIB(dl,       main)
--AC_CHECK_LIB(nsl,      main)
-+dnl AC_CHECK_LIB(nsl,      main)
- AC_CHECK_LIB(socket,   main)
- AC_CHECK_LIB(ipc,      main)
- AC_CHECK_LIB(IPC,      main)
-@@ -630,6 +631,6 @@
- AC_CHECK_LIB(BSD,      main)
- AC_CHECK_LIB(gen,      main)
- AC_CHECK_LIB(PW,       main)
--AC_CHECK_LIB(resolv,   main)
-+dnl AC_CHECK_LIB(resolv,   main)
- AC_SEARCH_LIBS(getopt_long, [getopt gnugetopt])
- # QNX:
-@@ -639,7 +640,8 @@
- # BeOS:
- if test "$PORTNAME" = "beos"
- then
--      AC_CHECK_LIB(bind, __inet_ntoa)
-+      dnl AC_CHECK_LIB(bind, __inet_ntoa)
-+      AC_CHECK_FUNC(inet_ntoa, ,[AC_CHECK_LIB(bind,     __inet_ntoa)]) 
- fi
- # Solaris:
- AC_SEARCH_LIBS(fdatasync, [rt posix4])
++AC_SUBST([BONJOUR_LIBS])
+ 
+ # for contrib/uuid-ossp
+ if test "$with_uuid" = bsd ; then
+diff -urNp -x '*.orig' postgresql-12.4.org/src/Makefile.global.in postgresql-12.4/src/Makefile.global.in
+--- postgresql-12.4.org/src/Makefile.global.in 2020-08-10 23:15:53.000000000 +0200
++++ postgresql-12.4/src/Makefile.global.in     2021-11-09 09:31:40.651435766 +0100
+@@ -173,6 +173,7 @@ includedir_internal = $(pkgincludedir)/i
+ pgxsdir = $(pkglibdir)/pgxs
+ bitcodedir = $(pkglibdir)/bitcode
+ 
++BONJOUR_LIBS            = @BONJOUR_LIBS@
+ 
+ ##########################################################################
+ #
+diff -urNp -x '*.orig' postgresql-12.4.org/src/backend/Makefile postgresql-12.4/src/backend/Makefile
+--- postgresql-12.4.org/src/backend/Makefile   2020-08-10 23:15:53.000000000 +0200
++++ postgresql-12.4/src/backend/Makefile       2021-11-09 09:31:40.651435766 +0100
+@@ -60,7 +60,7 @@ ifneq ($(PORTNAME), win32)
+ ifneq ($(PORTNAME), aix)
+ 
+ postgres: $(OBJS)
+-      $(CC) $(CFLAGS) $(call expand_subsys,$^) $(LDFLAGS) $(LDFLAGS_EX) $(export_dynamic) $(LIBS) -o $@
++      $(CC) $(CFLAGS) $(call expand_subsys,$^) $(LDFLAGS) $(LDFLAGS_EX) $(export_dynamic) $(LIBS) $(BONJOUR_LIBS) -o $@
+ 
+ endif
+ endif