From f5f4b391d9c3cbf269f740f0ee391aeee9bbbd77 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 23 Jan 2002 18:45:41 +0000 Subject: [PATCH] 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. --- src/pl/tcl/Makefile | 4 ---- src/pl/tcl/mkMakefile.tcldefs.sh | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile index 67e8df8535..191134f26d 100644 --- a/src/pl/tcl/Makefile +++ b/src/pl/tcl/Makefile @@ -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 index f9faef2fdc..e9efdfef2f 100644 --- 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$ + 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" | -- 2.39.5