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.

diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 838f880469d75a265652b1071ed5cca8a02530cc..60ead6597c9eed5aebdad5025062844897e0961e 100644 (file)
--- 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
 

diff --git a/src/configure b/src/configure
index 1bfe87c27d77fad0ea53b0b2cd34433baaa47ca2..277b4783a2c950da141c8ad340929d5b1e91e880 100755 (executable)
--- a/src/configure
+++ b/src/configure
@@ -618,7 +618,7 @@ case "$host_os" in
    linux*) os=linux need_tas=no ;;
     bsdi*) os=bsdi need_tas=no ;;
  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 ;;
     dgux*) os=dgux need_tas=no ;;
      aix*) os=aix need_tas=no ;;

diff --git a/src/configure.in b/src/configure.in
index 8e182039619f4bd998a6dda8330edbf5a3e805de..6293c599a978ca1cb3d91753c81c590c64f7b63b 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -17,7 +17,7 @@ case "$host_os" in
    linux*) os=linux need_tas=no ;;
     bsdi*) os=bsdi need_tas=no ;;
  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 ;;
     dgux*) os=dgux need_tas=no ;;
      aix*) os=aix need_tas=no ;;

diff --git a/src/makefiles/Makefile.freebsd b/src/makefiles/Makefile.freebsd
index 4a852a4b04ec45bb1a17459eb7d9f3d71e23937a..46f5a7f961c9fcf86c0e4a7236450eb4f8e2a35e 100644 (file)
--- a/src/makefiles/Makefile.freebsd
+++ b/src/makefiles/Makefile.freebsd
@@ -5,9 +5,9 @@
        @${AR} cq $@.pic `lorder $<.obj | tsort`
        ${RANLIB} $@.pic
        @rm -f $@
-       ifdef ELF_SYSTEM
-               $(LD) -x -Bshareable -o $@ $@.pic
-       else
-               $(LD) -x -Bshareable -Bforcearchive -o $@ $@.pic
-       endif
+ifdef ELF_SYSTEM
+       $(LD) -x -Bshareable -o $@ $@.pic
+else
+        $(LD) -x -Bshareable -Bforcearchive -o $@ $@.pic
+endif