rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Tom Lane 2002-01-23 18:45:41 +00:00
parent 8ac3b16789
commit 830cdb5f45
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pl/tcl/Makefile
View File

@ -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)

5
src/pl/tcl/mkMakefile.tcldefs.sh
View File

@ -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" |