Skip to content

Commit 0aa9287

Browse files
scrappyscrappy
committed
Various fixes NETBSD/sparc related
From: Tom I Helbekkmo <tih@Hamartun.Priv.NO>
1 parent a65e448 commit 0aa9287

File tree

8 files changed

+65
-11
lines changed

8 files changed

+65
-11
lines changed

‎src/backend/Makefile

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#
3535
#
3636
# IDENTIFICATION
37-
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.29 1997/12/20 00:22:06 scrappy Exp $
37+
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.30 1998/01/04 19:12:02 scrappy Exp $
3838
#
3939
#-------------------------------------------------------------------------
4040

@@ -51,6 +51,14 @@ endif
5151

5252
OBJS = $(DIRS:%=%/SUBSYS.o)
5353

54+
# kerberos flags
55+
56+
ifdef KRBVERS
57+
CFLAGS+= $(KRBFLAGS)
58+
LDFLAGS+= $(KRBLIBS)
59+
endif
60+
61+
5462
all: postgres $(POSTGRES_IMP) global1.bki.source local1_template1.bki.source \
5563
global1.description local1_template1.description
5664

@@ -121,7 +129,6 @@ install: $(LIBDIR) $(BINDIR) $(HEADERDIR) postgres $(POSTGRES_IMP) fmgr.h\
121129
global1.bki.source local1_template1.bki.source \
122130
global1.description local1_template1.description \
123131
libpq/pg_hba.conf.sample optimizer/geqo/pg_geqo.sample
124-
125132
$(INSTALL) $(INSTL_EXE_OPTS) postgres $(BINDIR)/postgres
126133
ifeq ($(MAKE_EXPORTS), true)
127134
$(INSTALL) $(INSTLOPTS) $(POSTGRES_IMP) $(LIBDIR)/$(POSTGRES_IMP)

‎src/bin/pg_dump/Makefile.in

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/Makefile.in,v 1.4 1997/04/26 06:13:31 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/Makefile.in,v 1.5 1998/01/04 19:12:06 scrappy Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -18,6 +18,14 @@ OBJS= pg_dump.o common.o @STRDUP@
1818

1919
CFLAGS+= -I$(LIBPQDIR)
2020

21+
#
22+
# And where libpq goes, so goes the authentication stuff...
23+
#
24+
ifdef KRBVERS
25+
LDFLAGS+= $(KRBLIBS)
26+
CFLAGS+= $(KRBFLAGS)
27+
endif
28+
2129
all: submake pg_dump
2230

2331
pg_dump: $(OBJS) $(LIBPQDIR)/libpq.a

‎src/bin/pg_id/Makefile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/Makefile,v 1.6 1997/04/26 05:05:20 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/Makefile,v 1.7 1998/01/04 19:12:11 scrappy Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -16,6 +16,14 @@ include ../../Makefile.global
1616

1717
OBJS= pg_id.o
1818

19+
#
20+
# And where libpq goes, so goes the authentication stuff...
21+
#
22+
ifdef KRBVERS
23+
LDFLAGS+= $(KRBLIBS)
24+
CFLAGS+= $(KRBFLAGS)
25+
endif
26+
1927
all: pg_id
2028

2129
pg_id: $(OBJS) $(LIBPQDIR)/libpq.a

‎src/bin/psql/Makefile.in

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.5 1997/04/26 05:06:40 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.6 1998/01/04 19:12:21 scrappy Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -16,6 +16,14 @@ include ../../Makefile.global
1616

1717
CFLAGS+= -I$(LIBPQDIR)
1818

19+
#
20+
# And where libpq goes, so goes the authentication stuff...
21+
#
22+
ifdef KRBVERS
23+
LDFLAGS+= $(KRBLIBS)
24+
CFLAGS+= $(KRBFLAGS)
25+
endif
26+
1927
OBJS= psql.o stringutils.o @STRDUP@
2028

2129
all: submake psql

‎src/include/storage/s_lock.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.14 1997/12/30 04:01:28 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.15 1998/01/04 19:12:38 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -241,12 +241,11 @@ tas_dummy()
241241

242242
static int tas(slock_t *lock);
243243

244-
static int
244+
static void
245245
tas_dummy()
246246
{
247247
asm(".seg \"data\"");
248248
asm(".seg \"text\"");
249-
asm(".global _tas");
250249
asm("_tas:");
251250

252251
/*
@@ -321,7 +320,7 @@ void S_LOCK(slock_t* lock);
321320

322321
#endif /* defined(__alpha__) && defined(linux) */
323322

324-
#if (defined(linux) || defined(__NetBSD__)) && defined(sparc)
323+
#if defined(linux) && defined(sparc)
325324

326325
#define S_LOCK(lock) do \
327326
{ \

‎src/test/bench/Makefile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/test/bench/Attic/Makefile,v 1.4 1997/07/28 23:57:20 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/test/bench/Attic/Makefile,v 1.5 1998/01/04 19:12:48 scrappy Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -19,6 +19,14 @@ OUTFILES= bench.out bench.out.perquery
1919

2020
CFLAGS+= -I$(LIBPQDIR) $(CFLAGS_SL)
2121

22+
#
23+
# And where libpq goes, so goes the authentication stuff...
24+
#
25+
ifdef KRBVERS
26+
LDFLAGS+= $(KRBLIBS)
27+
CFLAGS+= $(KRBFLAGS)
28+
endif
29+
2230
all: $(CREATEFILES)
2331
rm -f $(OUTFILES)
2432

‎src/tutorial/C-code/Makefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@ include ../../Makefile.global
33

44
CFLAGS+= -I../../include -I$(LIBPQDIR)
55

6+
#
7+
# And where libpq goes, so goes the authentication stuff...
8+
#
9+
ifdef KRBVERS
10+
LDFLAGS+= $(KRBLIBS)
11+
CFLAGS+= $(KRBFLAGS)
12+
endif
13+
614
all: complex$(DLSUFFIX) funcs$(DLSUFFIX)
715

816
clean:

‎src/tutorial/Makefile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for tutorial
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/tutorial/Makefile,v 1.5 1997/01/05 21:17:45 bryanh Exp $
7+
# $Header: /cvsroot/pgsql/src/tutorial/Makefile,v 1.6 1998/01/04 19:12:55 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,6 +13,14 @@ include ../Makefile.global
1313

1414
CFLAGS+= -I$(LIBPQDIR) -I../../include
1515

16+
#
17+
# And where libpq goes, so goes the authentication stuff...
18+
#
19+
ifdef KRBVERS
20+
LDFLAGS+= $(KRBLIBS)
21+
CFLAGS+= $(KRBFLAGS)
22+
endif
23+
1624
#
1725
# DLOBJS is the dynamically-loaded object files. The "funcs" queries
1826
# include CREATE FUNCTIONs that load routines from these files.

0 commit comments

Comments
 (0)