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

Commita9ddd64

Browse files
committed
Modify the platform-specific makefiles so that macro 'rpath' is defined
in terms of macro 'rpathdir', as I proposed a few weeks ago. In itselfthis commit shouldn't change the behavior at all, but it opens the doorto using special rpaths for the PL shared libraries, as seems to beneeded for plperl in particular.
1 parentb603848 commita9ddd64

11 files changed

+22
-20
lines changed

‎src/Makefile.global.in

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*-makefile-*-
2-
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.204 2004/10/20 02:12:07 neilc Exp $
2+
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.205 2004/11/19 00:41:38 tgl Exp $
33

44
#------------------------------------------------------------------------------
55
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -284,6 +284,10 @@ ELF_SYSTEM= @ELF_SYS@
284284
# Pull in platform-specific magic
285285
include$(top_builddir)/src/Makefile.port
286286

287+
# Set up rpath if enabled. By default it will point to our libdir,
288+
# but individual Makefiles can force other rpath paths if needed.
289+
rpathdir =$(libdir)
290+
287291
ifeq ($(enable_rpath), yes)
288292
LDFLAGS +=$(rpath)
289293
endif

‎src/makefiles/Makefile.bsdi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ endif
1414

1515
ifeq ($(DLSUFFIX), .so)
1616
CFLAGS_SL = -fpic
17-
rpath = -Wl,-rpath,$(libdir)
17+
rpath = -Wl,-rpath,$(rpathdir)
1818
export_dynamic = -export-dynamic
1919
shlib_symbolic = -Wl,-Bsymbolic
2020
else

‎src/makefiles/Makefile.freebsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ AROPT = cr
22

33
ifdef ELF_SYSTEM
44
export_dynamic = -export-dynamic
5-
rpath = -R$(libdir)
5+
rpath = -R$(rpathdir)
66
shlib_symbolic = -Wl,-Bsymbolic -lc
77
endif
88

‎src/makefiles/Makefile.hpux

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,12 @@ endif
1616
# correctly in the LP64 data model.
1717
LIBS := -lxnet $(LIBS)
1818

19-
# Embed 'libdir' as the shared library search path so that the executables
20-
# don't need SHLIB_PATH to be set. (We do not observe the --enable-rpath
21-
# switch here because you'd get rather bizarre behavior if you leave this
22-
# option off.)
19+
# Set up rpath so that the executables don't need SHLIB_PATH to be set.
20+
# (Note: --disable-rpath is a really bad idea on this platform...)
2321
ifeq ($(with_gnu_ld), yes)
24-
LDFLAGS += -Wl,-rpath -Wl,$(libdir)
22+
rpath= -Wl,-rpath,$(rpathdir)
2523
else
26-
LDFLAGS += -Wl,+b -Wl,$(libdir)
24+
rpath= -Wl,+b,$(rpathdir)
2725
endif
2826

2927
# catch null pointer dereferences

‎src/makefiles/Makefile.irix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MK_NO_LORDER= true
22
AROPT = crs
3-
rpath = -Wl,-rpath,$(libdir)
3+
rpath = -Wl,-rpath,$(rpathdir)
44
shlib_symbolic = -Wl,-B,symbolic
55

66
DLSUFFIX = .so

‎src/makefiles/Makefile.linux

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
AROPT = crs
22
export_dynamic = -Wl,-E
3-
rpath = -Wl,-rpath,$(libdir)
3+
rpath = -Wl,-rpath,$(rpathdir)
44
shlib_symbolic = -Wl,-Bsymbolic
55
allow_nonpic_in_shlib = yes
66
DLSUFFIX = .so

‎src/makefiles/Makefile.netbsd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ AROPT = cr
22

33
ifdef ELF_SYSTEM
44
export_dynamic = -Wl,-E
5-
rpath = -Wl,-R$(libdir)
5+
rpath = -Wl,-R$(rpathdir)
66
shlib_symbolic = -Wl,-Bsymbolic -lc
77
else
8-
rpath = -R$(libdir)
8+
rpath = -R$(rpathdir)
99
endif
1010

1111
DLSUFFIX = .so

‎src/makefiles/Makefile.openbsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ AROPT = cr
22

33
ifdef ELF_SYSTEM
44
export_dynamic = -Wl,-E
5-
rpath = -R$(libdir)
5+
rpath = -R$(rpathdir)
66
shlib_symbolic = -Wl,-Bsymbolic
77
endif
88

‎src/makefiles/Makefile.osf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
AROPT = crs
22
DLSUFFIX = .so
33
CFLAGS_SL =
4-
rpath = -rpath $(libdir)
4+
rpath = -rpath $(rpathdir)
55

66
%.so: %.o
77
$(LD) -shared -expect_unresolved '*' -o $@ $<

‎src/makefiles/Makefile.solaris

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# $PostgreSQL: pgsql/src/makefiles/Makefile.solaris,v 1.10 2003/11/29 19:52:12 pgsql Exp $
1+
# $PostgreSQL: pgsql/src/makefiles/Makefile.solaris,v 1.11 2004/11/19 00:41:39 tgl Exp $
22

33
AROPT = crs
44

55
ifeq ($(with_gnu_ld), yes)
66
export_dynamic = -Wl,-E
7-
rpath = -Wl,-rpath,$(libdir)
7+
rpath = -Wl,-rpath,$(rpathdir)
88
else
9-
rpath = -R$(libdir)
9+
rpath = -R$(rpathdir)
1010
endif
1111
shlib_symbolic = -Wl,-Bsymbolic
1212

‎src/makefiles/Makefile.unixware

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ endif
77

88
ifeq ($(ld_R_works), yes)
99
ifeq ($(with_gnu_ld), yes)
10-
rpath = -Wl,-rpath,$(libdir)
10+
rpath = -Wl,-rpath,$(rpathdir)
1111
else
12-
rpath = -Wl,-R$(libdir)
12+
rpath = -Wl,-R$(rpathdir)
1313
endif
1414
endif
1515
shlib_symbolic = -Wl,-Bsymbolic

0 commit comments

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