mirror of https://github.com/postgres/postgres
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>
REL7_0_PATCHES
Bruce Momjian
26 years ago
parent
26c953e373
commit
f43ec05d05
@ -0,0 +1,107 @@ |
||||
/*-
|
||||
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc |
||||
* Portions Copyright (c) 1990 The Regents of the University of California. |
||||
* All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions |
||||
* are met: |
||||
* 1. Redistributions of source code must retain the above copyright |
||||
* notice, this list of conditions and the following disclaimer. |
||||
* 2. Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* 3. All advertising materials mentioning features or use of this software |
||||
* must display the following acknowledgement: |
||||
* This product includes software developed by the University of |
||||
* California, Berkeley and its contributors. |
||||
* 4. Neither the name of the University nor the names of its contributors |
||||
* may be used to endorse or promote products derived from this software |
||||
* without specific prior written permission. |
||||
* |
||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND |
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE |
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL |
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS |
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) |
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY |
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
||||
* SUCH DAMAGE. |
||||
*/ |
||||
|
||||
#if defined(LIBC_SCCS) && !defined(lint) |
||||
static char sccsid[] = "@(#)dl.c 5.4 (Berkeley) 2/23/91"; |
||||
|
||||
#endif /* LIBC_SCCS and not lint */ |
||||
|
||||
#include <sys/types.h> |
||||
#include <nlist.h> |
||||
#include "link.h" |
||||
#include <dlfcn.h> |
||||
|
||||
#include <stdio.h> |
||||
#include <stdlib.h> |
||||
|
||||
#include "dynloader.h" |
||||
|
||||
static char error_message[BUFSIZ]; |
||||
|
||||
char * |
||||
BSD44_derived_dlerror(void) |
||||
{ |
||||
static char ret[BUFSIZ]; |
||||
|
||||
strcpy(ret, error_message); |
||||
error_message[0] = 0; |
||||
return (ret[0] == 0) ? (char *) NULL : ret; |
||||
} |
||||
|
||||
void * |
||||
BSD44_derived_dlopen(const char *file, int num) |
||||
{ |
||||
#if defined(__mips__) || (defined(__NetBSD__) && defined(__vax__)) |
||||
sprintf(error_message, "dlopen (%s) not supported", file); |
||||
return NULL; |
||||
#else |
||||
void *vp; |
||||
|
||||
if ((vp = dlopen((char *) file, num)) == (void *) NULL) |
||||
sprintf(error_message, "dlopen (%s) failed", file); |
||||
return vp; |
||||
#endif |
||||
} |
||||
|
||||
void * |
||||
BSD44_derived_dlsym(void *handle, const char *name) |
||||
{ |
||||
#if defined(__mips__) || (defined(__NetBSD__) && defined(__vax__)) |
||||
sprintf(error_message, "dlsym (%s) failed", name); |
||||
return NULL; |
||||
#elif defined(__ELF__) |
||||
return dlsym(handle, name); |
||||
#else |
||||
void *vp; |
||||
char buf[BUFSIZ]; |
||||
|
||||
if (*name != '_') |
||||
{ |
||||
sprintf(buf, "_%s", name); |
||||
name = buf; |
||||
} |
||||
if ((vp = dlsym(handle, (char *) name)) == (void *) NULL) |
||||
sprintf(error_message, "dlsym (%s) failed", name); |
||||
return vp; |
||||
#endif |
||||
} |
||||
|
||||
void |
||||
BSD44_derived_dlclose(void *handle) |
||||
{ |
||||
#if defined(__mips__) || (defined(__NetBSD__) && defined(__vax__)) |
||||
#else |
||||
dlclose(handle); |
||||
#endif |
||||
} |
||||
@ -0,0 +1,49 @@ |
||||
/*-------------------------------------------------------------------------
|
||||
* |
||||
* port_protos.h |
||||
* port-specific prototypes for NetBSD 1.0 |
||||
* |
||||
* |
||||
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc |
||||
* Portions Copyright (c) 1994, Regents of the University of California |
||||
* |
||||
* $Id: netbsd.h,v 1.1 2000/03/08 01:58:17 momjian Exp $ |
||||
* |
||||
*------------------------------------------------------------------------- |
||||
*/ |
||||
#ifndef PORT_PROTOS_H |
||||
#define PORT_PROTOS_H |
||||
|
||||
#include <sys/types.h> |
||||
#include <nlist.h> |
||||
#include "link.h" |
||||
|
||||
#include "postgres.h" |
||||
|
||||
#include "fmgr.h" |
||||
#include "utils/dynamic_loader.h" |
||||
|
||||
/* dynloader.c */ |
||||
/*
|
||||
* Dynamic Loader on NetBSD 1.0. |
||||
* |
||||
* this dynamic loader uses the system dynamic loading interface for shared |
||||
* libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared |
||||
* library as the file to be dynamically loaded. |
||||
* |
||||
* agc - I know this is all a bit crufty, but it does work, is fairly |
||||
* portable, and works (the stipulation that the d.l. function must |
||||
* begin with an underscore is fairly tricky, and some versions of |
||||
* NetBSD (like 1.0, and 1.0A pre June 1995) have no dlerror.) |
||||
*/ |
||||
#define pg_dlopen(f) BSD44_derived_dlopen(f, 1) |
||||
#define pg_dlsym BSD44_derived_dlsym |
||||
#define pg_dlclose BSD44_derived_dlclose |
||||
#define pg_dlerror BSD44_derived_dlerror |
||||
|
||||
char *BSD44_derived_dlerror(void); |
||||
void *BSD44_derived_dlopen(const char *filename, int num); |
||||
void *BSD44_derived_dlsym(void *handle, const char *name); |
||||
void BSD44_derived_dlclose(void *handle); |
||||
|
||||
#endif /* PORT_PROTOS_H */ |
||||
@ -0,0 +1,43 @@ |
||||
#define USE_POSIX_TIME |
||||
|
||||
#if defined(__i386__) |
||||
#define NEED_I386_TAS_ASM |
||||
#define HAS_TEST_AND_SET |
||||
#endif |
||||
|
||||
#if defined(__sparc__) |
||||
#define NEED_SPARC_TAS_ASM |
||||
#define HAS_TEST_AND_SET |
||||
#endif |
||||
|
||||
#if defined(__vax__) |
||||
#define NEED_VAX_TAS_ASM |
||||
#define HAS_TEST_AND_SET |
||||
#endif |
||||
|
||||
#if defined(__ns32k__) |
||||
#define NEED_NS32K_TAS_ASM |
||||
#define HAS_TEST_AND_SET |
||||
#endif |
||||
|
||||
#if defined(__m68k__) |
||||
#define HAS_TEST_AND_SET |
||||
#endif |
||||
|
||||
#if defined(__arm__) |
||||
#define HAS_TEST_AND_SET |
||||
#endif |
||||
|
||||
#if defined(__mips__) |
||||
/* # undef HAS_TEST_AND_SET */ |
||||
#endif |
||||
|
||||
#if defined(__powerpc__) |
||||
#define HAS_TEST_AND_SET |
||||
#endif |
||||
|
||||
#if defined(__powerpc__) |
||||
typedef unsigned int slock_t; |
||||
#else |
||||
typedef unsigned char slock_t; |
||||
#endif |
||||
@ -0,0 +1,16 @@ |
||||
ifdef ELF_SYSTEM |
||||
LDFLAGS += -Wl,-E
|
||||
endif |
||||
%.so: %.o |
||||
ifdef ELF_SYSTEM |
||||
$(LD) -x -Bshareable -o $@ $<
|
||||
else |
||||
$(LD) $(LDREL) $(LDOUT) $<.obj -x $<
|
||||
@echo building shared object $@
|
||||
@rm -f $@.pic
|
||||
@${AR} cq $@.pic `lorder $<.obj | tsort`
|
||||
${RANLIB} $@.pic
|
||||
@rm -f $@
|
||||
$(LD) -x -Bshareable -Bforcearchive \
|
||||
-o $@ $@.pic
|
||||
endif |
||||
Loading…
Reference in new issue