mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor FreeBSD fixes put in place

Browse Source 
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.
This commit is contained in:
Marc G. Fournier 1998-10-31 03:58:55 +00:00
parent 2e18525dbe
commit 15d61bb439
4 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Makefile.shlib
View File

@ -6,7 +6,7 @@
# Copyright (c) 1998, Regents of the University of California # Copyright (c) 1998, Regents of the University of California
# #
# IDENTIFICATION # 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 # Makefile.global (or really Makefile.port) to supply DLSUFFIX and other
# symbols. # 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) ifeq ($(PORTNAME), bsd)
ifdef BSD_SHLIB ifdef BSD_SHLIB
install-shlib-dep := install-shlib install-shlib-dep := install-shlib
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
LDFLAGS_SL := -x -Bshareable -Bforcearchive LDFLAGS_SL := -x -Bshareable -Bforcearchive
CFLAGS += $(CFLAGS_SL) CFLAGS += $(CFLAGS_SL)
endif endif
endif endif

2
src/configure vendored
View File

@ -618,7 +618,7 @@ case "$host_os" in
linux*) os=linux need_tas=no ;; linux*) os=linux need_tas=no ;;
bsdi*) os=bsdi need_tas=no ;; bsdi*) os=bsdi need_tas=no ;;
freebsd3*) os=freebsd need_tas=no elf=yes ;; freebsd3*) os=freebsd need_tas=no elf=yes ;;
freebsd1*) os=freebsd need_tas=no ;; freebsd12*) os=freebsd need_tas=no ;;
netbsd*|openbsd*) os=bsd need_tas=no ;; netbsd*|openbsd*) os=bsd need_tas=no ;;
dgux*) os=dgux need_tas=no ;; dgux*) os=dgux need_tas=no ;;
aix*) os=aix need_tas=no ;; aix*) os=aix need_tas=no ;;

2
src/configure.in
View File

@ -17,7 +17,7 @@ case "$host_os" in
linux*) os=linux need_tas=no ;; linux*) os=linux need_tas=no ;;
bsdi*) os=bsdi need_tas=no ;; bsdi*) os=bsdi need_tas=no ;;
freebsd3*) os=freebsd need_tas=no elf=yes ;; freebsd3*) os=freebsd need_tas=no elf=yes ;;
freebsd1*) os=freebsd need_tas=no ;; freebsd[12]*) os=freebsd need_tas=no ;;
netbsd*|openbsd*) os=bsd need_tas=no ;; netbsd*|openbsd*) os=bsd need_tas=no ;;
dgux*) os=dgux need_tas=no ;; dgux*) os=dgux need_tas=no ;;
aix*) os=aix need_tas=no ;; aix*) os=aix need_tas=no ;;

10
src/makefiles/Makefile.freebsd
View File

@ -5,9 +5,9 @@
@${AR} cq $@.pic `lorder $<.obj | tsort` @${AR} cq $@.pic `lorder $<.obj | tsort`
${RANLIB} $@.pic ${RANLIB} $@.pic
@rm -f $@ @rm -f $@
ifdef ELF_SYSTEM ifdef ELF_SYSTEM
$(LD) -x -Bshareable -o $@ $@.pic $(LD) -x -Bshareable -o $@ $@.pic
else else
$(LD) -x -Bshareable -Bforcearchive -o $@ $@.pic $(LD) -x -Bshareable -Bforcearchive -o $@ $@.pic
endif endif