Index: configure
--- configure.orig	2020-09-21 22:47:36.000000000 +0200
+++ configure	2020-09-24 20:03:19.893708000 +0200
@@ -7626,7 +7626,7 @@
 See \`config.log' for more details" "$LINENO" 5; }
 else
 	ICU_CFLAGS=$pkg_cv_ICU_CFLAGS
-	ICU_LIBS=$pkg_cv_ICU_LIBS
+	ICU_LIBS="$pkg_cv_ICU_LIBS -lstdc++"
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
@@ -9690,12 +9690,6 @@
 test "$PORTNAME" = "win32" && perl_useshrplib=`echo $perl_useshrplib | sed 's,\\\\,/,g'`
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $perl_useshrplib" >&5
 $as_echo "$perl_useshrplib" >&6; }
-  if test "$perl_useshrplib" != yes && test "$perl_useshrplib" != true; then
-    as_fn_error $? "cannot build PL/Perl because libperl is not a shared library
-You might have to rebuild your Perl installation.  Refer to the
-documentation for details.  Use --without-perl to disable building
-PL/Perl." "$LINENO" 5
-  fi
   # On most platforms, archlibexp is also where the Perl include files live ...
   perl_includespec="-I$perl_archlibexp/CORE"
   # ... but on newer macOS versions, we must use -iwithsysroot to look
@@ -9928,12 +9922,6 @@
 		done
 	fi
 fi
-if test "$found_shlib" != 1; then
-	as_fn_error $? "could not find shared library for Python
-You might have to rebuild your Python installation.  Refer to the
-documentation for details.  Use --without-python to disable building
-PL/Python." "$LINENO" 5
-fi
 python_libspec="-L${python_libdir} -l${ldlibrary}"
 
 python_additional_libs=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBS','LIBC','LIBM','BASEMODLIBS'))))"`
Index: src/Makefile.shlib
--- src/Makefile.shlib.orig	2020-09-21 22:47:36.000000000 +0200
+++ src/Makefile.shlib	2020-09-24 20:03:19.893888000 +0200
@@ -260,7 +260,7 @@
 
 .PHONY: all-lib all-static-lib all-shared-lib
 
-all-lib: all-shared-lib
+all-lib:
 ifdef soname
 # no static library when building a dynamically loadable module
 all-lib: all-static-lib
Index: src/backend/Makefile
--- src/backend/Makefile.orig	2020-09-21 22:47:36.000000000 +0200
+++ src/backend/Makefile	2020-09-24 20:03:19.894052000 +0200
@@ -48,7 +48,7 @@
 LIBS := $(filter-out -lpgport -lpgcommon, $(LIBS)) $(LDAP_LIBS_BE) $(ICU_LIBS)
 
 # The backend doesn't need everything that's in LIBS, however
-LIBS := $(filter-out -lz -lreadline -ledit -ltermcap -lncurses -lcurses, $(LIBS))
+LIBS := $(filter-out -lreadline -ledit -ltermcap -lncurses -lcurses, $(LIBS))
 
 ifeq ($(with_systemd),yes)
 LIBS += -lsystemd
Index: src/makefiles/Makefile.freebsd
--- src/makefiles/Makefile.freebsd.orig	2020-09-24 20:03:19.894495000 +0200
+++ src/makefiles/Makefile.freebsd	2020-09-24 20:06:36.705183000 +0200
@@ -16,4 +16,4 @@
 
 # Rule for building a shared library from a single .o file
 %.so: %.o
-	$(CC) $(CFLAGS) $< $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@
+	$(CC) $(CFLAGS) $< $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $(SHLIB_LINK)
Index: src/makefiles/Makefile.linux
--- src/makefiles/Makefile.linux.orig	2020-09-21 22:47:36.000000000 +0200
+++ src/makefiles/Makefile.linux	2020-09-24 20:03:19.894665000 +0200
@@ -10,4 +10,4 @@
 
 # Rule for building a shared library from a single .o file
 %.so: %.o
-	$(CC) $(CFLAGS) $< $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@
+	$(CC) $(CFLAGS) $< $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $(SHLIB_LINK)