Commit830cdb5

committed

Clean up Red Hat Tcl RPM brain-damage in a more reliable way: fix the

value of TCL_SHLIB_LD in the shell script that creates Makefile.tcldefs,rather than trying to persude gmake to do it.

1 parent8ac3b16 commit830cdb5Copy full SHA for 830cdb5

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#`
`3`	`3`	`# Makefile for the pltcl shared object`
`4`	`4`	`#`
`5`		`-# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.36 2002/01/21 03:27:46 tgl Exp $`
	`5`	`+# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.37 2002/01/23 18:45:41 tgl Exp $`
`6`	`6`	`#`
`7`	`7`	`#-------------------------------------------------------------------------`
`8`	`8`
`@@ -49,10 +49,6 @@ SHLIB_EXTRA_LIBS=`
`49`	`49`	`endif`
`50`	`50`	`endif`
`51`	`51`
`52`		`-# Suppress bogus soname switch that RedHat RPMs put into tclConfig.sh`
`53`		`-overrideTCL_SHLIB_LD :=$(shell echo "$(TCL_SHLIB_LD)" \| sed 's/-Wl,-soname[^ ]*//')`
`54`		`-`
`55`		`-`
`56`	`52`	`%$(TCL_SHLIB_SUFFIX):%.o`
`57`	`53`	`$(TCL_SHLIB_LD) -o$@$<$(TCL_LIB_SPEC)$(SHLIB_EXTRA_LIBS)`
`58`	`54`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`
`3`	`3`	`# $1 = path to tclConfig.sh ; $2 = output file`
`4`	`4`
	`5`	`+# $Header: /cvsroot/pgsql/src/pl/tcl/Attic/mkMakefile.tcldefs.sh,v 1.2 2002/01/23 18:45:41 tgl Exp $`
	`6`	`+`
`5`	`7`	`iftest x"$1" = x;then`
`6`	`8`	echo"$0: No tclConfig.sh file specified. Did you use\`configure --with-tcl'?"1>&2
`7`	`9`	`exit 1`
`@@ -10,6 +12,9 @@ fi`
`10`	`12`	`# Source the file to obtain the correctly expanded variable definitions`
`11`	`13`	`."$1"`
`12`	`14`
	`15`	`+# Suppress bogus soname switch that RedHat RPMs put into tclConfig.sh`
	`16`	+TCL_SHLIB_LD=`echo"$TCL_SHLIB_LD"\| sed's/-Wl,-soname[^ ]*//'`
	`17`	`+`
`13`	`18`	`# Read the file a second time as an easy way of getting the list of variable`
`14`	`19`	`# definitions to output.`
`15`	`20`	`cat"$1"\|`

Comments

(0)