Обсуждение: Re: [HACKERS] Problem with dblink regression test - FIXED

Поиск
Список
Период
Сортировка

Re: [HACKERS] Problem with dblink regression test - FIXED

От
"Jim C. Nasby"
Дата:
On Tue, Jun 28, 2005 at 02:28:11PM -0400, Andrew Dunstan wrote:
>
>
> Jim C. Nasby wrote:
>
> >All the logs for the most recent run against HEAD are now at
> >http://stats.distributed.net/~buildfarm/
> >
> >
> >
> >
>
> A quick look shows that when you use --with-libraries=/foo/bar the
> generated link line for libraries says
>
>  -L/foo/bar -lpq
>
> and it should probably be the other way around (as it is for the
> executables).
>
> So I suspect we need some makefile tuning.

You were correct. This patch fixes it:
Index: Makefile.shlib
===================================================================
RCS file: /projects/cvsroot/pgsql/src/Makefile.shlib,v
retrieving revision 1.90
diff -c -r1.90 Makefile.shlib
*** Makefile.shlib      20 Nov 2004 21:13:04 -0000      1.90
--- Makefile.shlib      29 Jun 2005 00:21:10 -0000
***************
*** 240,246 ****
    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
--- 240,246 ----
    SHLIB_LINK          += -ltermcap -lstdc++.r4 -lbind -lsocket -L/boot/develop/lib/x86
  endif

! SHLIB_LINK := $(SHLIB_LINK) $(filter -L%, $(LDFLAGS))
  ifeq ($(enable_rpath), yes)
  SHLIB_LINK += $(rpath)
  endif

--
Jim C. Nasby, Database Consultant               decibel@decibel.org
Give your computer some brain candy! www.distributed.net Team #1828

Windows: "Where do you want to go today?"
Linux: "Where do you want to go tomorrow?"
FreeBSD: "Are you guys coming, or what?"

Re: [HACKERS] Problem with dblink regression test - FIXED

От
Bruce Momjian
Дата:
Patch applied.  Thanks.

---------------------------------------------------------------------------


Jim C. Nasby wrote:
> On Tue, Jun 28, 2005 at 02:28:11PM -0400, Andrew Dunstan wrote:
> >
> >
> > Jim C. Nasby wrote:
> >
> > >All the logs for the most recent run against HEAD are now at
> > >http://stats.distributed.net/~buildfarm/
> > >
> > >
> > >
> > >
> >
> > A quick look shows that when you use --with-libraries=/foo/bar the
> > generated link line for libraries says
> >
> >  -L/foo/bar -lpq
> >
> > and it should probably be the other way around (as it is for the
> > executables).
> >
> > So I suspect we need some makefile tuning.
>
> You were correct. This patch fixes it:
> Index: Makefile.shlib
> ===================================================================
> RCS file: /projects/cvsroot/pgsql/src/Makefile.shlib,v
> retrieving revision 1.90
> diff -c -r1.90 Makefile.shlib
> *** Makefile.shlib      20 Nov 2004 21:13:04 -0000      1.90
> --- Makefile.shlib      29 Jun 2005 00:21:10 -0000
> ***************
> *** 240,246 ****
>     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
> --- 240,246 ----
>     SHLIB_LINK          += -ltermcap -lstdc++.r4 -lbind -lsocket -L/boot/develop/lib/x86
>   endif
>
> ! SHLIB_LINK := $(SHLIB_LINK) $(filter -L%, $(LDFLAGS))
>   ifeq ($(enable_rpath), yes)
>   SHLIB_LINK += $(rpath)
>   endif
>
> --
> Jim C. Nasby, Database Consultant               decibel@decibel.org
> Give your computer some brain candy! www.distributed.net Team #1828
>
> Windows: "Where do you want to go today?"
> Linux: "Where do you want to go tomorrow?"
> FreeBSD: "Are you guys coming, or what?"
>
> ---------------------------(end of broadcast)---------------------------
> TIP 6: Have you searched our list archives?
>
>                http://archives.postgresql.org
>

--
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 359-1001
  +  If your life is a hard drive,     |  13 Roberts Road
  +  Christ can be your backup.        |  Newtown Square, Pennsylvania 19073