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

tglsfdc · tglsfdc · commit 830cdb5f457b · 2002-01-23T18:45:41.000Z
value of TCL_SHLIB_LD in the shell script that creates Makefile.tcldefs,
rather than trying to persude gmake to do it.
diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for the pltcl shared object
 #
-# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.36 2002/01/21 03:27:46 tgl Exp $
+# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.37 2002/01/23 18:45:41 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -49,10 +49,6 @@ SHLIB_EXTRA_LIBS=
 endif
 endif
 
-# Suppress bogus soname switch that RedHat RPMs put into tclConfig.sh
-override TCL_SHLIB_LD := $(shell echo "$(TCL_SHLIB_LD)" | sed 's/-Wl,-soname[^ ]*//')
-
-
 %$(TCL_SHLIB_SUFFIX): %.o
 	$(TCL_SHLIB_LD) -o $@ $< $(TCL_LIB_SPEC) $(SHLIB_EXTRA_LIBS)
 
diff --git a/src/pl/tcl/mkMakefile.tcldefs.sh b/src/pl/tcl/mkMakefile.tcldefs.sh
@@ -2,6 +2,8 @@
 
 # $1 = path to tclConfig.sh ; $2 = output file
 
+# $Header: /cvsroot/pgsql/src/pl/tcl/Attic/mkMakefile.tcldefs.sh,v 1.2 2002/01/23 18:45:41 tgl Exp $
+
 if test x"$1" = x ; then
    echo "$0: No tclConfig.sh file specified. Did you use \`configure --with-tcl'?" 1>&2
    exit 1
@@ -10,6 +12,9 @@ fi
 # Source the file to obtain the correctly expanded variable definitions
 . "$1"
 
+# Suppress bogus soname switch that RedHat RPMs put into tclConfig.sh
+TCL_SHLIB_LD=`echo "$TCL_SHLIB_LD" | sed 's/-Wl,-soname[^ ]*//'`
+
 # Read the file a second time as an easy way of getting the list of variable
 # definitions to output.
 cat "$1" |

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`		`-override TCL_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`