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

Okay, this shoudl provide a fix for the freebsd problem...

Browse Source 
Added a ELF_SYS variable and check to configure.in...
This commit is contained in:
Marc G. Fournier 1998-10-30 04:54:06 +00:00
parent c6338530f6
commit 4283089d07
5 changed files with 350 additions and 322 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Makefile.global.in
View File

@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.52 1998/10/19 00:00:40 tgl Exp $
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.53 1998/10/30 04:53:55 scrappy Exp $
#
# NOTES
# Essentially all Postgres make files include this file and use the
@ -49,6 +49,10 @@
# example of this), set BSD_SHLIB to null in Makefile.custom.
BSD_SHLIB= true
# This is mainly for use on FreeBSD, where we have both a.out and elf
# systems now. May be applicable to other systems to?
ELF_SYSTEM= @ELF_SYS@
LIBPQDIR:= $(SRCDIR)/interfaces/libpq
# For convenience, POSTGRESDIR is where BINDIR, and LIBDIR

8
src/backend/parser/gram.c
View File

@ -229,7 +229,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.47 1998/10/17 04:08:36 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.48 1998/10/30 04:54:01 scrappy Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@ -4464,7 +4464,7 @@ static const short yycheck[] = { 3,
-1, -1, -1, -1, -1, -1, 204
};
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
#line 3 "/usr/local/bison/bison.simple"
#line 3 "/usr/share/misc/bison.simple"
/* Skeleton output parser for bison,
Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
@ -4657,7 +4657,7 @@ __yy_memcpy (char *to, char *from, int count)
#endif
#endif
#line 196 "/usr/local/bison/bison.simple"
#line 196 "/usr/share/misc/bison.simple"
/* The user can define YYPARSE_PARAM as the name of an argument to be passed
into yyparse. The argument should have type void *.
@ -10416,7 +10416,7 @@ case 930:
break;}
}
/* the action file gets copied in in place of this dollarsign */
#line 498 "/usr/local/bison/bison.simple"
#line 498 "/usr/share/misc/bison.simple"
yyvsp -= yylen;
yyssp -= yylen;

638
src/configure vendored
View File

File diff suppressed because it is too large Load Diff

12
src/configure.in
View File

@ -16,7 +16,8 @@ case "$host_os" in
aux*) os=aux need_tas=no ;;
linux*) os=linux need_tas=no ;;
bsdi*) os=bsdi need_tas=no ;;
freebsd*) os=freebsd need_tas=no ;;
freebsd3*) os=freebsd need_tas=no elf=yes ;;
freebsd1*) os=freebsd need_tas=no ;;
netbsd*|openbsd*) os=bsd need_tas=no ;;
dgux*) os=dgux need_tas=no ;;
aix*) os=aix need_tas=no ;;
@ -47,6 +48,13 @@ nextstep*) os=nextstep need_tas=no ;;
exit;;
esac
if test "X$elf" = "Xyes"
then
ELF_SYS=true
else
ELF_SYS=false
fi
if test "X$need_tas" = "Xyes"
then
AC_LINK_FILES(backend/port/tas/${tas_file}, backend/port/tas.s)
@ -358,6 +366,7 @@ echo "- setting CPPFLAGS=$CPPFLAGS"
LDFLAGS="$LDFLAGS $PGSQL_LDFLAGS"
echo "- setting LDFLAGS=$LDFLAGS"
AC_SUBST(ELF_SYS)
AC_SUBST(PORTNAME)
AC_SUBST(SRCDIR)
AC_SUBST(LDFLAGS)
@ -533,6 +542,7 @@ AC_CHECK_HEADERS(readline/readline.h readline/history.h ieeefp.h fp_class.h)
AC_CHECK_HEADERS(netinet/in.h string.h strings.h)
dnl ODBC headers...
AC_CHECK_HEADERS(sys/param.h pwd.h)
dnl
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST

8
src/makefiles/Makefile.freebsd
View File

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