PostgreSQL 6.4 patches - portability related.

Started by Billy G. Allieover 27 years ago2 messages

Bill.Allie@mug.org

over 27 years ago

1 attachment(s)

My patches to 'mkMakeFile.tcldefs.sh.in' and 'mkMakefile.tcltkdefs.sh.in',
while they fixed the problem with unexpanded variable references,
re-introduced a bug that Jan Wieck had squashed. The problem has to do with
some shells (ksh95 and some (newer) versions of bash) quoting the output of
the set command. This patch corrects that problem while still insuring that
all variable references are expanded.

Attachments:

uw7-3.patchapplication/x-patch; name=uw7-3.patchDownload

*** src/bin/pgtclsh/mkMakefile.tcltkdefs.sh.in.orig	Sun Oct 11 19:05:23 1998
--- src/bin/pgtclsh/mkMakefile.tcltkdefs.sh.in	Sun Oct 11 18:56:05 1998
***************
*** 13,26 ****
      exit 1
  fi
  
! set												| 
!     egrep '^TCL_|^TK_'							|
!     sed -e 's/=[ 	]*/="/' -e 's/[ 	]*$/"/'	|
!     while read v
      do
! 		eval "$v"
! 		v1=`echo $v | sed -e 's/=.*//'`
! 		eval "echo $v1 = \"\$$v1\""
      done >Makefile.tcldefs
  
  exit 0
--- 13,23 ----
      exit 1
  fi
  
! cat @TCL_CONFIG_SH@ @TK_CONFIG_SH@ |
!     egrep '^TCL_|^TK_' |
!     while read inp
      do
! 	    eval eval echo $inp
      done >Makefile.tcldefs
  
  exit 0
*** src/pl/tcl/mkMakefile.tcldefs.sh.in.orig	Sun Oct 11 14:33:24 1998
--- src/pl/tcl/mkMakefile.tcldefs.sh.in	Sun Oct 11 18:57:46 1998
***************
*** 6,21 ****
      exit 1
  fi
  
! . @TCL_CONFIG_SH@
! 
! set												| 
!     egrep '^TCL_|^TK_'							|
!     sed -e 's/=[ 	]*/="/' -e 's/[ 	]*$/"/'	|
!     while read v
      do
! 		eval "$v"
! 		v1=`echo $v | sed -e 's/=.*//'`
! 		eval "echo $v1 = \"\$$v1\""
      done >Makefile.tcldefs
  
  exit 0
--- 6,16 ----
      exit 1
  fi
  
! cat @TCL_CONFIG_SH@ |
!     egrep '^TCL_|^TK_' |
!     while read inp
      do
! 	    eval eval echo $inp
      done >Makefile.tcldefs
  
  exit 0

Bruce Momjian

maillist@candle.pha.pa.us

over 27 years ago

In reply to: Billy G. Allie (#1)

Re: [HACKERS] PostgreSQL 6.4 patches - portability related.

Applied.

My patches to 'mkMakeFile.tcldefs.sh.in' and 'mkMakefile.tcltkdefs.sh.in',
while they fixed the problem with unexpanded variable references,
re-introduced a bug that Jan Wieck had squashed. The problem has to do with
some shells (ksh95 and some (newer) versions of bash) quoting the output of
the set command. This patch corrects that problem while still insuring that
all variable references are expanded.

Content-Description: uw7-3.patch

[Attachment, skipping...]

____ | Billy G. Allie | Domain....: Bill.Allie@mug.org
| /| | 7436 Hartwell | Compuserve: 76337,2061
|-/-|----- | Dearborn, MI 48126| MSN.......: B_G_Allie@email.msn.com
|/ |LLIE | (313) 582-1540 |

-- 
  Bruce Momjian                        |  http://www.op.net/~candle
  maillist@candle.pha.pa.us            |  (610) 853-3000
  +  If your life is a hard drive,     |  830 Blythe Avenue
  +  Christ can be your backup.        |  Drexel Hill, Pennsylvania 19026