diff options
author | Andrew Dunstan <andrew@dunslane.net> | 2010-12-17 11:51:32 -0500 |
---|---|---|
committer | Andrew Dunstan <andrew@dunslane.net> | 2010-12-17 11:51:32 -0500 |
commit | f2f63551cdafcdec4169557122522229aa2530e8 (patch) | |
tree | 73fc52028f2ea8bfbe094f7cf5b541bdd11214a6 /src | |
parent | 6a61d58ca8d28b1d0e49a6906ac61ab86f12493c (diff) | |
download | postgresql-f2f63551cdafcdec4169557122522229aa2530e8.tar.gz postgresql-f2f63551cdafcdec4169557122522229aa2530e8.zip |
Backpatch plperl GNUmakefile fixes to allow building release 8.2 on Mingw with a modern perl.
Diffstat (limited to 'src')
-rw-r--r-- | src/pl/plperl/GNUmakefile | 6 |
1 files changed, 5 insertions, 1 deletions
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 |