diff options
| author | Marc G. Fournier | 1998-10-31 03:58:55 +0000 |
|---|---|---|
| committer | Marc G. Fournier | 1998-10-31 03:58:55 +0000 |
| commit | 15d61bb43968123a78b7f2ae2b4ce689fbdaa83e (patch) | |
| tree | 4ec3c89b5faaebbe203d1e771f0d4ed278a3223e /src/Makefile.shlib | |
| parent | 2e18525dbefc882c6749d91abb2c0d22d520b652 (diff) | |
Minor FreeBSD fixes put in place
From: SHIOZAKI Takehiko <takehi-s@ascii.co.jp>
I tried snapshot(Oct30) and made some patches.
# I think that it is confused to manage both Makefile.shlib and
# makefiles/Makefile.*, don't you?
* configure
Now FreeBSD 2.X is not supported..., so I added its entry.
If ELF_SYSTEM is set, gmake treat it defined even though
it is "false". So nothing should be set to use "ifdef".
BSD_SHLIB etc. may have same problems.
* Makefile.shlib
As you said, FreeBSD entry is much like BSD's.
I only added ELF_SYSTEM code.
* makefiles/Makefile.freebsd
Ifdef/else/endif can not be indented with TABs.
Diffstat (limited to 'src/Makefile.shlib')
| -rw-r--r-- | src/Makefile.shlib | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 838f880469d..60ead6597c9 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -6,7 +6,7 @@ # Copyright (c) 1998, Regents of the University of California # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.2 1998/10/28 06:49:04 thomas Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.3 1998/10/31 03:58:51 scrappy Exp $ # #------------------------------------------------------------------------- @@ -56,12 +56,25 @@ install-shlib-dep := # Makefile.global (or really Makefile.port) to supply DLSUFFIX and other # symbols. +ifeq ($(PORTNAME), freebsd) + ifdef BSD_SHLIB + install-shlib-dep := install-shlib + shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) + ifdef ELF_SYSTEM + LDFLAGS_SL := -x -Bshareable + else + LDFLAGS_SL := -x -Bshareable -Bforcearchive + endif + CFLAGS += $(CFLAGS_SL) + endif +endif + ifeq ($(PORTNAME), bsd) ifdef BSD_SHLIB install-shlib-dep := install-shlib - shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) - LDFLAGS_SL := -x -Bshareable -Bforcearchive - CFLAGS += $(CFLAGS_SL) + shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) + LDFLAGS_SL := -x -Bshareable -Bforcearchive + CFLAGS += $(CFLAGS_SL) endif endif |