Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita738478

Browse files
committed
Here are additional patches for the UnixWare 7 port.Summary of changes:In pqcomm.h, use the SUN_LEN macro if it is defined to calculatethe size of the sockaddr_un structure.In unixware.h, drop the use of the UNIXWARE macro. Everything canbe handled with the USE_UNIVEL_CC and DISABLE_COMPLEX_MACRO macros.In s_lock.h, remove the reference to the UNIXWARE macro (see above).In the unixware template, add the YFLAGS:-d line.In various makefile templates, add (or cleanup) unixware and univelport specific information.-- Billy G. Allie
1 parent9005da0 commita738478

File tree

7 files changed

+49
-11
lines changed

7 files changed

+49
-11
lines changed

‎src/include/libpq/pqcomm.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: pqcomm.h,v 1.26 1998/07/09 03:29:01 scrappy Exp $
9+
* $Id: pqcomm.h,v 1.27 1998/08/22 04:24:18 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -34,9 +34,14 @@ typedef union SockAddr
3434

3535
/* Configure the UNIX socket address for the well known port. */
3636

37+
#if defined(SUN_LEN)
38+
#defineUNIXSOCK_PATH(sun,port) \
39+
(sprintf((sun).sun_path, "/tmp/.s.PGSQL.%d", (port)), SUN_LEN(&(sun)))
40+
#else
3741
#defineUNIXSOCK_PATH(sun,port) \
3842
(sprintf((sun).sun_path, "/tmp/.s.PGSQL.%d", (port)), \
3943
strlen((sun).sun_path)+ offsetof(struct sockaddr_un, sun_path))
44+
#endif
4045

4146
/*
4247
*We do this because sun_len is in BSD's struct, while others don't.

‎src/include/port/unixware.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,17 @@
55

66
#defineHAS_TEST_AND_SET
77
#defineNEED_I386_TAS_ASM
8+
89
/***************************************
910
* Define this if you are compiling with
1011
* the native UNIXWARE C compiler.
1112
***************************************/
12-
#defineUNIXWARE
13+
#defineUSE_UNIVEL_CC
14+
1315
typedefunsignedcharslock_t;
1416

17+
#defineDISABLE_COMPLEX_MACRO
18+
1519
/***************************************************************
1620
* The following include will get the needed prototype for the
1721
* strcasecmp() function.

‎src/include/storage/s_lock.h

Lines changed: 3 additions & 3 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.43 1998/07/20 17:45:49 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.44 1998/08/22 04:24:21 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -188,7 +188,7 @@ tas(volatile slock_t *lock)
188188
#if defined(NEED_I386_TAS_ASM)
189189
/* non gcc i386 based things */
190190

191-
#if defined(USE_UNIVEL_CC)|| defined(UNIXWARE)
191+
#if defined(USE_UNIVEL_CC)
192192
#defineTAS(lock)tas(lock)
193193

194194
asmint
@@ -203,7 +203,7 @@ tas(slock_t *s_lock)
203203
popl%ebx
204204
}
205205

206-
#endif/* USE_UNIVEL_CC|| UNIXWARE*/
206+
#endif/* USE_UNIVEL_CC */
207207

208208
#endif/* NEED_I386_TAS_ASM */
209209

‎src/interfaces/libpgtcl/Makefile.in

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.19 1998/07/12 18:48:05 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.20 1998/08/22 04:24:26 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -66,6 +66,13 @@ ifeq ($(PORTNAME), solaris)
6666
CFLAGS+=$(CFLAGS_SL)
6767
endif
6868

69+
ifeq ($(PORTNAME), unixware)
70+
install-shlib-dep:= install-shlib
71+
shlib:= libpgtcl.so.1
72+
LDFLAGS_SL= -G -z text
73+
CFLAGS+=$(CFLAGS_SL)
74+
endif
75+
6976
ifeq ($(PORTNAME), univel)
7077
install-shlib-dep:= install-shlib
7178
shlib:= libpgtcl.so.1

‎src/interfaces/libpq++/Makefile

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.19 1998/07/12 19:20:45 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.20 1998/08/22 04:24:35 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -56,6 +56,20 @@ ifeq ($(PORTNAME), solaris)
5656
CFLAGS +=$(CFLAGS_SL)
5757
endif
5858

59+
ifeq ($(PORTNAME), unixware)
60+
install-shlib-dep := install-shlib
61+
shlib := libpq.so.1
62+
LDFLAGS_SL = -G -z text
63+
CFLAGS +=$(CFLAGS_SL)
64+
endif
65+
66+
ifeq ($(PORTNAME), univel)
67+
install-shlib-dep := install-shlib
68+
shlib := libpq.so.1
69+
LDFLAGS_SL = -G -z text
70+
CFLAGS +=$(CFLAGS_SL)
71+
endif
72+
5973
ifeq ($(PORTNAME), hpux)
6074
install-shlib-dep := install-shlib
6175
shlib := libpq.sl

‎src/interfaces/libpq/Makefile.in

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.26 1998/08/17 03:50:29 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.27 1998/08/22 04:24:28 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -73,9 +73,16 @@ ifeq ($(PORTNAME), solaris)
7373
CFLAGS +=$(CFLAGS_SL)
7474
endif
7575

76+
ifeq ($(PORTNAME), unixware)
77+
install-shlib-dep := install-shlib
78+
shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
79+
LDFLAGS_SL = -G -z text
80+
CFLAGS +=$(CFLAGS_SL)
81+
endif
82+
7683
ifeq ($(PORTNAME), univel)
7784
install-shlib-dep := install-shlib
78-
shlib := libpq.so.1
85+
shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
7986
LDFLAGS_SL = -G -z text
8087
CFLAGS +=$(CFLAGS_SL)
8188
endif

‎src/template/unixware

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
AROPT:crs
22
CFLAGS:-Xa -v -O -K i486,host,inline,loop_unroll,alloca -Dsvr4
33
SHARED_LIB:-K PIC
4-
SRCH_INC:
5-
SRCH_LIB:
4+
SRCH_INC:/opt/include
5+
SRCH_LIB:/opt/lib
66
USE_LOCALE:no
77
DLSUFFIX:.so
88
CC:cc
9+
YFLAGS:-d

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp