Back-patch recent changes to alter the order of -L flags inserted from

LDFLAGS versus those built into the Makefiles.  This looks like it will
fix several buildfarm failures in the back branches.

diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 002071e06cc1afe9b3a6bc8f14adadd20cd17ef1..2fbe117159849a588dff1adb37fe930b0e41197a 100644 (file)
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -6,7 +6,7 @@
 # Copyright (c) 1998, Regents of the University of California
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/Makefile.shlib,v 1.90 2004/11/20 21:13:04 tgl Exp $
+#    $PostgreSQL: pgsql/src/Makefile.shlib,v 1.90.4.1 2005/07/17 04:05:47 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -73,6 +73,9 @@ LINK.static = $(AR) $(AROPT)
 
 ifeq ($(enable_shared), yes)
 
+# Insert -L from LDFLAGS after any -L already present in SHLIB_LINK
+SHLIB_LINK := $(filter -L%, $(SHLIB_LINK)) $(filter -L%, $(LDFLAGS)) $(filter-out -L%, $(SHLIB_LINK))
+
 # Default shlib naming convention used by the majority of platforms
 shlib          = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
 shlib_major    = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
@@ -240,7 +243,6 @@ ifeq ($(PORTNAME), beos)
   SHLIB_LINK           += -ltermcap -lstdc++.r4 -lbind -lsocket -L/boot/develop/lib/x86
 endif
 
-SHLIB_LINK := $(filter -L%, $(LDFLAGS)) $(SHLIB_LINK)
 ifeq ($(enable_rpath), yes)
 SHLIB_LINK += $(rpath)
 endif

diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile
index eb633d400b0dc2462f62729e170f49f19f6d9a8d..e9141c510e9779869bf88d288356440f9c1569ae 100644 (file)
--- a/src/pl/plperl/GNUmakefile
+++ b/src/pl/plperl/GNUmakefile
@@ -1,5 +1,5 @@
 # Makefile for PL/Perl
-# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.18 2004/11/19 19:22:58 tgl Exp $
+# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.18.4.1 2005/07/17 04:05:49 tgl Exp $
 
 subdir = src/pl/plperl
 top_builddir = ../../..
@@ -19,7 +19,7 @@ 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_embed_ldflags := -L$(perl_archlibexp)/CORE -lperl58
 override CPPFLAGS += -DPLPERL_HAVE_UID_GID
 endif