database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-19 13:42:17 +03:00
Code Activity

I've made a diff against the 7.0beta1 tree that accomplishes several things:

Browse Source 
1) adds NetBSD shared lib support on both ELF and a.out platforms

        2) replaces "-L$(LIBPQDIR) -lpq" with "$(LIBPQ)" defined in
           Makefile.global.  This makes it much easier to build stuff in
           the source tree after you've already installed the libraries.

        3) adds TEMPLATEDIR in Makefile.global that indicates where the
           database templates are stored.  This separates the template files
           from real libraries that are installed in $(LIBDIR).
        4) changes include order of <readline/readline.h> and <readline.h>.
           The latest GNU readline installs its headers under a readline
           subdirectory.

In addition to applying the patch below the following files need to be copied:

        backend/port/dynloader:
                bsd.h -> netbsd.h
                bsd.c -> netbsd.c
        include/port:
                bsd.h -> netbsd.h
        makefiles:
                Makefile.bsd -> Makefile.netbsd

It would be great to see this incorporated into the source tree before
the 7.0 release is cut.

        Thanks!

     -- Johnny C. Lam <lamj@stat.cmu.edu>
This commit is contained in:
Bruce Momjian
2000-03-08 01:58:46 +00:00
parent 26c953e373
commit f43ec05d05
21 changed files with 297 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/interfaces/ecpg/lib/Makefile.in
View File

@@ -6,18 +6,18 @@
# Copyright (c) 1994, Regents of the University of California
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.62 2000/03/07 15:10:52 meskes Exp $
# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.63 2000/03/08 01:58:24 momjian Exp $
#
#-------------------------------------------------------------------------
NAME= ecpg
SO_MAJOR_VERSION= 3
SO_MINOR_VERSION= 1.0
SO_MINOR_VERSION= 1
SRCDIR= @top_srcdir@
include $(SRCDIR)/Makefile.global
CFLAGS+= -I../include -I$(SRCDIR)/interfaces/libpq
CFLAGS+= -I../include -I$(LIBPQDIR)
ifdef KRBVERS
CFLAGS+= $(KRBFLAGS)
@@ -26,7 +26,7 @@ endif
OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \
connect.o misc.o
SHLIB_LINK= -L../../libpq -lpq
SHLIB_LINK= $(LIBPQ)
# Shared library stuff, also default 'all' target
include $(SRCDIR)/Makefile.shlib

10
src/interfaces/jdbc/Makefile
View File

@@ -4,7 +4,7 @@
# Makefile for Java JDBC interface
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/Makefile,v 1.16 1999/09/15 21:56:16 peter Exp $
# $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/Makefile,v 1.17 2000/03/08 01:58:25 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -34,11 +34,11 @@ all:
@echo
@echo If you are using JDK1.1.x, you will need the JDBC1.2 driver.
@echo To compile, type:
@echo " make jdbc1"
@echo " $(MAKE) jdbc1"
@echo
@echo "If you are using JDK1.2 (aka Java2) you need the JDBC2."
@echo To compile, type:
@echo " make jdbc2"
@echo " $(MAKE) jdbc2"
@echo ------------------------------------------------------------
msg:
@@ -59,10 +59,10 @@ msg:
@echo
@echo ------------------------------------------------------------
@echo To build the examples, type:
@echo " make examples"
@echo " $(MAKE) examples"
@echo
@echo "To build the CORBA example (requires Java2):"
@echo " make corba"
@echo " $(MAKE) corba"
@echo ------------------------------------------------------------
@echo

6
src/interfaces/libpgeasy/Makefile.in
View File

@@ -4,7 +4,7 @@
# Makefile for pgeasy library
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/Attic/Makefile.in,v 1.5 2000/01/10 15:41:28 momjian Exp $
# $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/Attic/Makefile.in,v 1.6 2000/03/08 01:58:33 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -23,9 +23,7 @@ endif
OBJS= libpgeasy.o halt.o
SHLIB_LINK+= -L../libpq -lpq
SHLIB_LINK+= -L../libpq -lpq
SHLIB_LINK+= $(LIBPQ)
# If crypt is a separate library, rather than part of libc, it may need
# to be referenced separately to keep (broken) linkers happy. (This is

4
src/interfaces/libpgtcl/Makefile.in
View File

@@ -6,7 +6,7 @@
# Copyright (c) 1994, Regents of the University of California
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.38 2000/01/10 15:41:29 momjian Exp $
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.39 2000/03/08 01:58:36 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -27,7 +27,7 @@ endif
OBJS= pgtcl.o pgtclCmds.o pgtclId.o
SHLIB_LINK+= -L../libpq -lpq
SHLIB_LINK+= $(LIBPQ)
# If crypt is a separate library, rather than part of libc, it may need
# to be referenced separately to keep (broken) linkers happy. (This is

6
src/interfaces/libpq++/Makefile.in
View File

@@ -6,7 +6,7 @@
# Copyright (c) 1994, Regents of the University of California
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.20 2000/01/10 15:41:31 momjian Exp $
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.21 2000/03/08 01:58:37 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -43,9 +43,9 @@ endif
OBJS = pgconnection.o pgdatabase.o pgtransdb.o pgcursordb.o pglobject.o
ifeq ($(PORTNAME), win)
SHLIB_LINK+= --driver-name g++ -L../libpq -lpq
SHLIB_LINK+= --driver-name g++ $(LIBPQ)
else
SHLIB_LINK= -L../libpq -lpq
SHLIB_LINK= $(LIBPQ)
endif
# For CC on IRIX, must use CC as linker/archiver of C++ libraries