Include appropriate flags for resolved shared library LDFLAGS_ODBC

Thomas G. Lockhart · Thomas G. Lockhart · commit 20a034d5bdef · 1998-10-28T06:49:10.000Z
to allow ODBC library to be linked.
diff --git a/src/Makefile.shlib b/src/Makefile.shlib
@@ -6,7 +6,7 @@
 # Copyright (c) 1998, Regents of the University of California
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.1 1998/10/19 00:00:40 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.2 1998/10/28 06:49:04 thomas Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -95,6 +95,7 @@ ifeq ($(PORTNAME), linux)
   install-shlib-dep	:= install-shlib
   shlib				:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
   LDFLAGS_SL		:= -shared -soname $(shlib)
+  LDFLAGS_ODBC		:= -Bsymbolic -lc -lm
   CFLAGS			+= $(CFLAGS_SL)
 endif
 
diff --git a/src/interfaces/odbc/GNUmakefile.in b/src/interfaces/odbc/GNUmakefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile.in,v 1.8 1998/10/21 05:39:19 thomas Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile.in,v 1.9 1998/10/28 06:49:10 thomas Exp $
 #
 #-------------------------------------------------------------------------
 @SET_MAKE@
@@ -42,6 +42,7 @@ SHLIB_LINK= $(LIBS)
 # Shared library stuff, also default 'all' target
 include $(SRCDIR)/Makefile.shlib
 
+LDFLAGS_SL+= $(LDFLAGS_ODBC)
 
 .PHONY: install install-ini beforeinstall-headers install-headers
 

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.1 1998/10/19 00:00:40 tgl Exp $`
	`9`	`+# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.2 1998/10/28 06:49:04 thomas Exp $`
`10`	`10`	`#`
`11`	`11`	`#-------------------------------------------------------------------------`
`12`	`12`
`@@ -95,6 +95,7 @@ ifeq ($(PORTNAME), linux)`
`95`	`95`	`install-shlib-dep := install-shlib`
`96`	`96`	`shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)`
`97`	`97`	`LDFLAGS_SL := -shared -soname $(shlib)`
	`98`	`+ LDFLAGS_ODBC := -Bsymbolic -lc -lm`
`98`	`99`	`CFLAGS += $(CFLAGS_SL)`
`99`	`100`	`endif`
`100`	`101`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile.in,v 1.8 1998/10/21 05:39:19 thomas Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile.in,v 1.9 1998/10/28 06:49:10 thomas Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`	`@SET_MAKE@`
`@@ -42,6 +42,7 @@ SHLIB_LINK= $(LIBS)`
`42`	`42`	`# Shared library stuff, also default 'all' target`
`43`	`43`	`include $(SRCDIR)/Makefile.shlib`
`44`	`44`
	`45`	`+LDFLAGS_SL+= $(LDFLAGS_ODBC)`
`45`	`46`
`46`	`47`	`.PHONY: install install-ini beforeinstall-headers install-headers`
`47`	`48`