From: Andrew Dunstan <andrew@dunslane.net>
Date: Fri, 17 Dec 2010 16:51:32 +0000 (-0500)
Subject: Backpatch plperl GNUmakefile fixes to allow building release 8.2 on Mingw with a... 
X-Git-Tag: REL8_2_20~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f2f63551cdafcdec4169557122522229aa2530e8;p=thirdparty%2Fpostgresql.git

Backpatch plperl GNUmakefile fixes to allow building release 8.2 on Mingw with a modern perl.
---

diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile
index 6ea3f68c9f9..2da437d470e 100644
--- a/src/pl/plperl/GNUmakefile
+++ b/src/pl/plperl/GNUmakefile
@@ -19,8 +19,12 @@ ifneq (,$(findstring yes, $(shared_libperl)$(allow_nonpic_in_shlib)))
 ifeq ($(PORTNAME), win32)
 perl_archlibexp := $(subst \,/,$(perl_archlibexp))
 perl_privlibexp := $(subst \,/,$(perl_privlibexp))
-perl_embed_ldflags := -L$(perl_archlibexp)/CORE -lperl58
+perl_lib := $(basename $(notdir $(wildcard $(perl_archlibexp)/CORE/perl[5-9]*.lib)))
+perl_embed_ldflags = -L$(perl_archlibexp)/CORE -l$(perl_lib)
 override CPPFLAGS += -DPLPERL_HAVE_UID_GID
+# Perl on win32 contains /* within comment all over the header file,
+# so disable this warning.
+override CFLAGS += -Wno-comment
 endif
 
 override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) -I$(perl_archlibexp)/CORE