From 0aa928764a2beddb000973313214227659ce9293 Mon Sep 17 00:00:00 2001
From: "Marc G. Fournier" <scrappy@hub.org>
Date: Sun, 4 Jan 1998 19:13:04 +0000
Subject: [PATCH] Various fixes NETBSD/sparc related
From: Tom I Helbekkmo <tih@Hamartun.Priv.NO>
---
src/backend/Makefile | 11 +++++++++--
src/bin/pg_dump/Makefile.in | 10 +++++++++-
src/bin/pg_id/Makefile | 10 +++++++++-
src/bin/psql/Makefile.in | 10 +++++++++-
src/include/storage/s_lock.h | 7 +++----
src/test/bench/Makefile | 10 +++++++++-
src/tutorial/C-code/Makefile | 8 ++++++++
src/tutorial/Makefile | 10 +++++++++-
8 files changed, 65 insertions(+), 11 deletions(-)
diff --git a/src/backend/Makefile b/src/backend/Makefile
index 285bf77d693..60b2d6f60d2 100644
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -34,7 +34,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.29 1997/12/20 00:22:06 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.30 1998/01/04 19:12:02 scrappy Exp $
#
#-------------------------------------------------------------------------
@@ -51,6 +51,14 @@ endif
OBJS = $(DIRS:%=%/SUBSYS.o)
+# kerberos flags
+
+ifdef KRBVERS
+CFLAGS+= $(KRBFLAGS)
+LDFLAGS+= $(KRBLIBS)
+endif
+
+
all: postgres $(POSTGRES_IMP) global1.bki.source local1_template1.bki.source \
global1.description local1_template1.description
@@ -121,7 +129,6 @@ install: $(LIBDIR) $(BINDIR) $(HEADERDIR) postgres $(POSTGRES_IMP) fmgr.h\
global1.bki.source local1_template1.bki.source \
global1.description local1_template1.description \
libpq/pg_hba.conf.sample optimizer/geqo/pg_geqo.sample
-
$(INSTALL) $(INSTL_EXE_OPTS) postgres $(BINDIR)/postgres
ifeq ($(MAKE_EXPORTS), true)
$(INSTALL) $(INSTLOPTS) $(POSTGRES_IMP) $(LIBDIR)/$(POSTGRES_IMP)
diff --git a/src/bin/pg_dump/Makefile.in b/src/bin/pg_dump/Makefile.in
index 57c74b826f8..6b5c5ef14a4 100644
--- a/src/bin/pg_dump/Makefile.in
+++ b/src/bin/pg_dump/Makefile.in
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/Makefile.in,v 1.4 1997/04/26 06:13:31 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/Makefile.in,v 1.5 1998/01/04 19:12:06 scrappy Exp $
#
#-------------------------------------------------------------------------
@@ -18,6 +18,14 @@ OBJS= pg_dump.o common.o @STRDUP@
CFLAGS+= -I$(LIBPQDIR)
+#
+# And where libpq goes, so goes the authentication stuff...
+#
+ifdef KRBVERS
+LDFLAGS+= $(KRBLIBS)
+CFLAGS+= $(KRBFLAGS)
+endif
+
all: submake pg_dump
pg_dump: $(OBJS) $(LIBPQDIR)/libpq.a
diff --git a/src/bin/pg_id/Makefile b/src/bin/pg_id/Makefile
index 42c6fbc753c..ed9b7cf957f 100644
--- a/src/bin/pg_id/Makefile
+++ b/src/bin/pg_id/Makefile
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/Makefile,v 1.6 1997/04/26 05:05:20 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/Makefile,v 1.7 1998/01/04 19:12:11 scrappy Exp $
#
#-------------------------------------------------------------------------
@@ -16,6 +16,14 @@ include ../../Makefile.global
OBJS= pg_id.o
+#
+# And where libpq goes, so goes the authentication stuff...
+#
+ifdef KRBVERS
+LDFLAGS+= $(KRBLIBS)
+CFLAGS+= $(KRBFLAGS)
+endif
+
all: pg_id
pg_id: $(OBJS) $(LIBPQDIR)/libpq.a
diff --git a/src/bin/psql/Makefile.in b/src/bin/psql/Makefile.in
index ab7de496fdc..62b32d4ec43 100644
--- a/src/bin/psql/Makefile.in
+++ b/src/bin/psql/Makefile.in
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.5 1997/04/26 05:06:40 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.6 1998/01/04 19:12:21 scrappy Exp $
#
#-------------------------------------------------------------------------
@@ -16,6 +16,14 @@ include ../../Makefile.global
CFLAGS+= -I$(LIBPQDIR)
+#
+# And where libpq goes, so goes the authentication stuff...
+#
+ifdef KRBVERS
+LDFLAGS+= $(KRBLIBS)
+CFLAGS+= $(KRBFLAGS)
+endif
+
OBJS= psql.o stringutils.o @STRDUP@
all: submake psql
diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
index b59146d8c0d..b4c48749898 100644
--- a/src/include/storage/s_lock.h
+++ b/src/include/storage/s_lock.h
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.14 1997/12/30 04:01:28 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.15 1998/01/04 19:12:38 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -241,12 +241,11 @@ tas_dummy()
static int tas(slock_t *lock);
-static int
+static void
tas_dummy()
{
asm(".seg \"data\"");
asm(".seg \"text\"");
- asm(".global _tas");
asm("_tas:");
/*
@@ -321,7 +320,7 @@ void S_LOCK(slock_t* lock);
#endif /* defined(__alpha__) && defined(linux) */
-#if (defined(linux) || defined(__NetBSD__)) && defined(sparc)
+#if defined(linux) && defined(sparc)
#define S_LOCK(lock) do \
{ \
diff --git a/src/test/bench/Makefile b/src/test/bench/Makefile
index 9e6a54fd858..69b1f365ada 100644
--- a/src/test/bench/Makefile
+++ b/src/test/bench/Makefile
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/test/bench/Attic/Makefile,v 1.4 1997/07/28 23:57:20 momjian Exp $
+# $Header: /cvsroot/pgsql/src/test/bench/Attic/Makefile,v 1.5 1998/01/04 19:12:48 scrappy Exp $
#
#-------------------------------------------------------------------------
@@ -19,6 +19,14 @@ OUTFILES= bench.out bench.out.perquery
CFLAGS+= -I$(LIBPQDIR) $(CFLAGS_SL)
+#
+# And where libpq goes, so goes the authentication stuff...
+#
+ifdef KRBVERS
+LDFLAGS+= $(KRBLIBS)
+CFLAGS+= $(KRBFLAGS)
+endif
+
all: $(CREATEFILES)
rm -f $(OUTFILES)
diff --git a/src/tutorial/C-code/Makefile b/src/tutorial/C-code/Makefile
index 548bfadcfe3..ec1fa1f21f5 100644
--- a/src/tutorial/C-code/Makefile
+++ b/src/tutorial/C-code/Makefile
@@ -3,6 +3,14 @@ include ../../Makefile.global
CFLAGS+= -I../../include -I$(LIBPQDIR)
+#
+# And where libpq goes, so goes the authentication stuff...
+#
+ifdef KRBVERS
+LDFLAGS+= $(KRBLIBS)
+CFLAGS+= $(KRBFLAGS)
+endif
+
all: complex$(DLSUFFIX) funcs$(DLSUFFIX)
clean:
diff --git a/src/tutorial/Makefile b/src/tutorial/Makefile
index 32b14b0b6d6..c575d040b49 100644
--- a/src/tutorial/Makefile
+++ b/src/tutorial/Makefile
@@ -4,7 +4,7 @@
# Makefile for tutorial
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/tutorial/Makefile,v 1.5 1997/01/05 21:17:45 bryanh Exp $
+# $Header: /cvsroot/pgsql/src/tutorial/Makefile,v 1.6 1998/01/04 19:12:55 scrappy Exp $
#
#-------------------------------------------------------------------------
@@ -13,6 +13,14 @@ include ../Makefile.global
CFLAGS+= -I$(LIBPQDIR) -I../../include
+#
+# And where libpq goes, so goes the authentication stuff...
+#
+ifdef KRBVERS
+LDFLAGS+= $(KRBLIBS)
+CFLAGS+= $(KRBFLAGS)
+endif
+
#
# DLOBJS is the dynamically-loaded object files. The "funcs" queries
# include CREATE FUNCTIONs that load routines from these files.
--
GitLab