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

Commit66f893f

Browse files
committed
Solaris shared library fixes.
1 parentbeac8c1 commit66f893f

File tree

5 files changed

+46
-14
lines changed

5 files changed

+46
-14
lines changed

‎src/interfaces/ecpg/lib/Makefile.in‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,18 @@ ifeq ($(PORTNAME), bsd)
3232
CFLAGS +=$(CFLAGS_SL)
3333
endif
3434
endif
35-
#ifeq ($(PORTNAME), solaris)
36-
# install-shlib-dep := install-shlib
37-
# shlib := libecpg.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION).$(SO_PATCHLEVEL)
38-
# LDFLAGS_SL = -G -z text
39-
# CFLAGS += $(CFLAGS_SL)
40-
#endif
35+
ifeq ($(PORTNAME), solaris_sparc)
36+
install-shlib-dep := install-shlib
37+
shlib := libecpg.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION).$(SO_PATCHLEVEL)
38+
LDFLAGS_SL = -G -z text
39+
CFLAGS +=$(CFLAGS_SL)
40+
endif
41+
ifeq ($(PORTNAME), solaris_i386)
42+
install-shlib-dep := install-shlib
43+
shlib := libecpg.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION).$(SO_PATCHLEVEL)
44+
LDFLAGS_SL = -G
45+
CFLAGS +=$(CFLAGS_SL)
46+
endif
4147
ifeq ($(PORTNAME), univel)
4248
install-shlib-dep := install-shlib
4349
shlib := libecpg.so.1

‎src/interfaces/libpgtcl/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/libpgtcl/Attic/Makefile.in,v 1.26 1998/10/09 21:28:46 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.27 1998/10/12 01:03:57 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -70,13 +70,20 @@ ifeq ($(PORTNAME), bsdi)
7070
endif
7171
endif
7272

73-
ifeq ($(PORTNAME),solaris)
73+
ifeq ($(PORTNAME),solaris_sparc)
7474
install-shlib-dep:= install-shlib
7575
shlib:= libpgtcl.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
7676
LDFLAGS_SL:= -G -z text
7777
CFLAGS+=$(CFLAGS_SL)
7878
endif
7979

80+
ifeq ($(PORTNAME), solaris_i386)
81+
install-shlib-dep:= install-shlib
82+
shlib:= libpgtcl.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
83+
LDFLAGS_SL:= -G
84+
CFLAGS+=$(CFLAGS_SL)
85+
endif
86+
8087
ifeq ($(PORTNAME), unixware)
8188
install-shlib-dep:= install-shlib
8289
shlib:= libpgtcl.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)

‎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.4 1998/10/10 17:08:11 thomas Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.5 1998/10/12 01:04:00 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -57,13 +57,20 @@ ifeq ($(PORTNAME), linux)
5757
CFLAGS +=$(CFLAGS_SL)
5858
endif
5959

60-
ifeq ($(PORTNAME),solaris)
60+
ifeq ($(PORTNAME),solaris_sparc)
6161
INSTALL-SHLIB-DEP := install-shlib
6262
SHLIB := libpq++.so.1
6363
LDFLAGS_SL = -G -z text -shared -soname$(SHLIB)
6464
CFLAGS +=$(CFLAGS_SL)
6565
endif
6666

67+
ifeq ($(PORTNAME), solaris_i386)
68+
INSTALL-SHLIB-DEP := install-shlib
69+
SHLIB := libpq++.so.1
70+
LDFLAGS_SL = -G -shared -soname$(SHLIB)
71+
CFLAGS +=$(CFLAGS_SL)
72+
endif
73+
6774
ifeq ($(PORTNAME), unixware)
6875
install-shlib-dep := install-shlib
6976
shlib := libpq.so.1

‎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.34 1998/10/09 21:28:48 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.35 1998/10/12 01:03:58 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -74,13 +74,20 @@ ifeq ($(PORTNAME), bsdi)
7474
endif
7575
endif
7676

77-
ifeq ($(PORTNAME),solaris)
77+
ifeq ($(PORTNAME),solaris_sparc)
7878
install-shlib-dep:= install-shlib
7979
shlib:= libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
8080
LDFLAGS_SL:= -G -z text
8181
CFLAGS+=$(CFLAGS_SL)
8282
endif
8383

84+
ifeq ($(PORTNAME), solaris_i386)
85+
install-shlib-dep:= install-shlib
86+
shlib:= libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
87+
LDFLAGS_SL:= -G
88+
CFLAGS+=$(CFLAGS_SL)
89+
endif
90+
8491
ifeq ($(PORTNAME), unixware)
8592
install-shlib-dep:= install-shlib
8693
shlib:= libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)

‎src/pl/plpgsql/src/Makefile.in‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for the plpgsql shared object
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/Makefile.in,v 1.5 1998/10/09 16:57:07 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/Makefile.in,v 1.6 1998/10/12 01:04:02 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -54,11 +54,16 @@ ifeq ($(PORTNAME), bsdi)
5454
endif
5555
endif
5656

57-
ifeq ($(PORTNAME),solaris)
57+
ifeq ($(PORTNAME),solaris_sparc)
5858
LDFLAGS_SL:= -G -z text
5959
CFLAGS+=$(CFLAGS_SL)
6060
endif
6161

62+
ifeq ($(PORTNAME), solaris_i386)
63+
LDFLAGS_SL:= -G
64+
CFLAGS+=$(CFLAGS_SL)
65+
endif
66+
6267
ifeq ($(PORTNAME), unixware)
6368
LDFLAGS_SL:= -G -z text
6469
CFLAGS+=$(CFLAGS_SL)

0 commit comments

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