NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit16e9487

committed

|> The Makefile.shlib changes will have to be discussed with other Linux

|> developers so we are sure it will work on all platforms.The problem with the current settings is that the linker is calleddirectly. This is wrong, it should always be called through thecompilerdriver (the only exception is `ld -r'). This will make sure that thenecessary libraries like libgcc are linked in.But there is still a different problem with the setting of LDFLAGS_ODBC.The psqlodbc module defines the functions _init and _fini which arereserved for the shared library initialisation. These should be changedto constructor functions. Then LDFLAGS_ODBC can be changed to be just`-lm'. Btw, why does it use -Bsymbolic?Andreas Schwab

1 parentd800532 commit16e9487Copy full SHA for 16e9487

File tree

2 files changed

+18

-6

lines changed

src
- Makefile.shlib
- interfaces/odbc
  - psqlodbc.c

2 files changed

+18

-6

lines changed

`‎src/Makefile.shlib`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`# Copyright (c) 1998, Regents of the University of California`
`7`	`7`	`#`
`8`	`8`	`# IDENTIFICATION`
`9`		`-# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.21 2000/06/28 18:29:13 petere Exp $`
	`9`	`+# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.22 2000/07/07 01:23:43 momjian Exp $`
`10`	`10`	`#`
`11`	`11`	`#-------------------------------------------------------------------------`
`12`	`12`
`@@ -143,9 +143,9 @@ endif`
`143`	`143`
`144`	`144`	`ifeq ($(PORTNAME), linux)`
`145`	`145`	`shlib:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)`
`146`		`-LDFLAGS_SL:=-Bdynamic -shared -soname $(shlib)`
`147`		`-LDFLAGS_ODBC:= -Bsymbolic -lc -lm`
`148`		`-SHLIB_LINK+= -lc`
	`146`	`+LD:=$(CC)`
	`147`	`+LDFLAGS_SL:= -shared -Wl,-soname,$(shlib)`
	`148`	`+LDFLAGS_ODBC:= -lm`
`149`	`149`	`CFLAGS+= $(CFLAGS_SL)`
`150`	`150`	`endif`
`151`	`151`

`‎src/interfaces/odbc/psqlodbc.c`

Lines changed: 14 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,6 @@`
`33`	`33`
`34`	`34`	`GLOBAL_VALUESglobals;`
`35`	`35`
`36`		`-BOOL_init(void);`
`37`		`-BOOL_fini(void);`
`38`	`36`	`RETCODESQL_APISQLDummyOrdinal(void);`
`39`	`37`
`40`	`38`	`#ifdefWIN32`
`@@ -97,6 +95,20 @@ WSADATA wsaData;`
`97`	`95`	`#defineFALSE(BOOL)0`
`98`	`96`	`#endif`
`99`	`97`
	`98`	`+#ifdef__GNUC__`
	`99`	`+`
	`100`	`+/* This function is called at library initialization time. */`
	`101`	`+`
	`102`	`+staticBOOL`
	`103`	`+__attribute__((constructor))`
	`104`	`+init(void)`
	`105`	`+{`
	`106`	`+getGlobalDefaults(DBMS_NAME,ODBCINST_INI, FALSE);`
	`107`	`+return TRUE;`
	`108`	`+}`
	`109`	`+`
	`110`	`+#else`
	`111`	`+`
`100`	`112`	`/* These two functions do shared library initialziation on UNIX, well at least`
`101`	`113`	`* on Linux. I don't know about other systems.`
`102`	`114`	`*/`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit16e9487

File tree

2 files changed

2 files changed

`‎src/Makefile.shlib`

`‎src/interfaces/odbc/psqlodbc.c`

0 commit comments