Commit1bf1597

committed

Revert rpath-mangling patch. See discussion on -patches around Nov 29 for

the rationale.

1 parenta60f9db commit1bf1597Copy full SHA for 1bf1597

File tree

-20

lines changed

-20

lines changed

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`# --makefile--`
`2`		`-# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.157 2002/12/30 17:19:50 tgl Exp $`
	`2`	`+# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.158 2003/01/05 13:45:47 petere Exp $`
`3`	`3`
`4`	`4`	`#------------------------------------------------------------------------------`
`5`	`5`	`# All PostgreSQL makefiles include this file and use the variables it sets,`
`@@ -190,9 +190,6 @@ LIBS = @LIBS@`
`190`	`190`	`LD = @LD@`
`191`	`191`	`with_gnu_ld = @with_gnu_ld@`
`192`	`192`	`ld_R_works = @ld_R_works@`
`193`		`-# Set trpath to a list of library paths included in LDFLAGS`
`194`		`-# These paths can be added to rpath in the port specific makefiles if needed.`
`195`		`-trpath =$(filter -L%,@LDFLAGS@)`
`196`	`193`	`LDFLAGS = @LDFLAGS@`
`197`	`194`	`LDREL = -r`
`198`	`195`	`LDOUT = -o`

Lines changed: 2 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,23 +7,9 @@ endif`
`7`	`7`
`8`	`8`	`ifeq ($(ld_R_works), yes)`
`9`	`9`	`ifeq ($(with_gnu_ld), yes)`
`10`		`-# Convert the list of library search paths into -rpath options`
`11`		`-# (i.e. "-LpathA -LpathB" -> ",-rpath,pathA,-rpath,pathB"), adding`
`12`		`-# the contents of LD_LIBRARY_PATH if it exists.`
`13`		`-tpath1=$(shell echo $(trpath) \| sed -e 's/ *-L/,-rpath,/g')`
`14`		`-ifdef LD_LIBRARY_PATH`
`15`		`-tpath2 = ,-rpath,$(shell echo $(LD_LIBRARY_PATH) \| sed -e 's/:/,-rpath,/g')`
`16`		`-endif`
`17`		`-rpath = -Wl,-rpath,$(libdir)$(tpath)$(tpath2)`
	`10`	`+rpath = -Wl,-rpath,$(libdir)`
`18`	`11`	`else`
`19`		`-# Convert the list of library search paths into a -R option path`
`20`		`-# (i.e. "-LpathA -LpathB" -> ":pathA:pathB"), adding the contents of`
`21`		`-# LD_LIBRARY_PATH if it exists.`
`22`		`-tpath1 = $(shell echo $(trpath) \| sed -e 's/ *-L/:/g')`
`23`		`-ifdef LD_LIBRARY_PATH`
`24`		`-tpath2 = :$(LD_LIBRARY_PATH)`
`25`		`-endif`
`26`		`-rpath = -Wl,-R$(libdir)$(tpath1)$(tpath2)`
	`12`	`+rpath = -Wl,-R$(libdir)`
`27`	`13`	`endif`
`28`	`14`	`endif`
`29`	`15`	`shlib_symbolic = -Wl,-Bsymbolic`

Comments

(0)