Movatterモバイル変換

Skip to content

postgrespro/postgresproPublic

NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commit9cf0a82

petere

committed

Fix linker options for ODBC driver. See comment in

src/interfaces/odbc/GNUmakefile.

1 parent2a81896 commit9cf0a82Copy full SHA for 9cf0a82

File tree

9 files changed

+16

-3

lines changed

src
- interfaces/odbc
  - GNUmakefile
- makefiles

9 files changed

+16

-3

lines changed

`‎src/interfaces/odbc/GNUmakefile‎`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#`
`3`	`3`	`# GNUMakefile for psqlodbc (Postgres ODBC driver)`
`4`	`4`	`#`
`5`		`-# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.7 2000/10/28 15:10:36 petere Exp $`
	`5`	`+# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.8 2000/12/16 18:14:25 petere Exp $`
`6`	`6`	`#`
`7`	`7`	`#-------------------------------------------------------------------------`
`8`	`8`
`@@ -30,6 +30,11 @@ all: all-lib`
`30`	`30`	`# Shared library stuff`
`31`	`31`	`include$(top_srcdir)/src/Makefile.shlib`
`32`	`32`
	`33`	`+# Symbols must be resolved to the version in the shared library because`
	`34`	`+# the driver manager (e.g., iodbc) provides some symbols with the same`
	`35`	`+# names and we don't want those. (This issue is probably ELF specific.)`
	`36`	`+LINK.shared +=$(shlib_symbolic)`
	`37`	`+`
`33`	`38`	`odbc_headers = isql.h isqlext.h iodbc.h`
`34`	`39`	`odbc_includedir =$(includedir)/iodbc`
`35`	`40`

`‎src/makefiles/Makefile.bsdi‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ endif`
`15`	`15`	`ifeq ($(DLSUFFIX), .so)`
`16`	`16`	`CFLAGS_SL = -fpic`
`17`	`17`	`export_dynamic = -export-dynamic`
	`18`	`+shlib_symbolic = -Bsymbolic`
`18`	`19`	`else`
`19`	`20`	`CFLAGS_SL =`
`20`	`21`	`endif`

`‎src/makefiles/Makefile.freebsd‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ AROPT = cr`
`3`	`3`	`ifdef ELF_SYSTEM`
`4`	`4`	`export_dynamic = -export-dynamic`
`5`	`5`	`rpath = -R$(libdir)`
	`6`	`+shlib_symbolic = -Bsymbolic`
`6`	`7`	`endif`
`7`	`8`
`8`	`9`	`DLSUFFIX = .so`

`‎src/makefiles/Makefile.irix5‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`MK_NO_LORDER= true`
`2`	`2`	`AROPT = crs`
`3`	`3`	`rpath = -Wl,-rpath,$(libdir)`
	`4`	`+shlib_symbolic = -Wl,-B,symbolic`
`4`	`5`
`5`	`6`	`DLSUFFIX = .so`
`6`	`7`	`# PIC is default`

`‎src/makefiles/Makefile.linux‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`AROPT = crs`
`2`	`2`	`export_dynamic = -export-dynamic`
`3`	`3`	`rpath = -Wl,-rpath,$(libdir)`
	`4`	`+shlib_symbolic = -Wl,-Bsymbolic`
`4`	`5`	`DLSUFFIX = .so`
`5`	`6`	`CFLAGS_SL = -fpic`
`6`	`7`

`‎src/makefiles/Makefile.netbsd‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ AROPT = cr`
`3`	`3`	`ifdef ELF_SYSTEM`
`4`	`4`	`export_dynamic = -Wl,-E`
`5`	`5`	`rpath = -Wl,-R$(libdir)`
	`6`	`+shlib_symbolic = -Wl,-Bsymbolic`
`6`	`7`	`endif`
`7`	`8`
`8`	`9`	`DLSUFFIX = .so`

`‎src/makefiles/Makefile.openbsd‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ AROPT = cr`
`3`	`3`	`ifdef ELF_SYSTEM`
`4`	`4`	`export_dynamic = -Wl,-E`
`5`	`5`	`rpath = -R$(libdir)`
	`6`	`+shlib_symbolic = -Bsymbolic`
`6`	`7`	`endif`
`7`	`8`
`8`	`9`	`DLSUFFIX = .so`

`‎src/makefiles/Makefile.solaris‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# $Header: /cvsroot/pgsql/src/makefiles/Makefile.solaris,v 1.5 2000/11/04 16:35:55 petere Exp $`
	`1`	`+# $Header: /cvsroot/pgsql/src/makefiles/Makefile.solaris,v 1.6 2000/12/16 18:14:25 petere Exp $`
`2`	`2`
`3`	`3`	`AROPT = crs`
`4`	`4`
`@@ -8,7 +8,7 @@ rpath = -Wl,-rpath,$(libdir)`
`8`	`8`	`else`
`9`	`9`	`rpath = -Wl,-R$(libdir)`
`10`	`10`	`endif`
`11`		`-`
	`11`	`+shlib_symbolic = -Wl,-Bsymbolic`
`12`	`12`
`13`	`13`	`DLSUFFIX = .so`
`14`	`14`	`ifeq ($(GCC), yes)`

`‎src/makefiles/Makefile.unixware‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@ export_dynamic = -Wl,-Bexport`
`3`	`3`	`ifeq ($(ld_R_works), yes)`
`4`	`4`	`rpath = -Wl,-R$(libdir)`
`5`	`5`	`endif`
	`6`	`+shlib_symbolic = -Wl,-Bsymbolic`
	`7`	`+`
`6`	`8`	`DLSUFFIX = .so`
`7`	`9`	`ifeq ($(GCC), yes)`
`8`	`10`	`CFLAGS_SL = -fpic`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp