[med-svn] [fis-gtm] 01/01: Fix for #775302 GTM-8041 Fix the bug in sr_unix/configure.gtc that caused compilations of UTF-8 mode object files to fail because 'locale -a' output in pbuilder did not include en_US.UTF-8.

[Amul Shah]

This is an automated email from the git hooks/post-receive script.

tuskentower-guest pushed a commit to branch master
in repository fis-gtm.

commit a18592f106842eaa0bc358d0736f958598f6ef78
Author: Amul Shah <Amul.Shah at fisglobal.com>
Date:   Thu Apr 23 23:05:45 2015 -0400

    Fix for #775302
    GTM-8041 Fix the bug in sr_unix/configure.gtc that caused compilations of UTF-8
    mode object files to fail because 'locale -a' output in pbuilder did not
    include en_US.UTF-8.
    
    Additionally trap errors in sr_unix/gtminstall.sh from the configure script.
    Had this error trapping existed previously, the first build logs would have
    shown this bug.
---
 debian/changelog        |  4 +++-
 debian/patches/fix_utf8 | 50 +++++++++++++++++++++++++++++--------------------
 2 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2952688..e36adf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 fis-gtm (6.2-001-1) experimental; urgency=low
 
   * Import latest sources and update package version 
+  * Fix a problem generating UTF-8 mode MUMPS object code
+    Closes: #775302
 
- -- Amul Shah <Amul.Shah at fisglobal.com>  Sun, 11 Jan 2015 19:58:13 -0500
+ -- Amul Shah <Amul.Shah at fisglobal.com>  Thu, 23 Apr 2015 23:00:17 -0400
 
 fis-gtm (6.2-000-1) unstable; urgency=low
 
diff --git a/debian/patches/fix_utf8 b/debian/patches/fix_utf8
index a0cb522..58cc5a6 100644
--- a/debian/patches/fix_utf8
+++ b/debian/patches/fix_utf8
@@ -1,36 +1,46 @@
 From: Amul Shah <Amul.Shah at fisglobal.com>
 Forwarded: not-needed
-Summary: Debugging information to diagnose #775302
-Description: Needed to change to final build stages to understand why there are
-  no UTF-8 mode object files.
-Last-Update: 2015-01-16
+Summary: Fix for #775302
+Description: GTM-8041 Fix the bug that caused compilations of UTF-8 mode object
+  files to fail because 'locale -a' output in pbuilder did not include
+  en_US.UTF-8.
+  Additionally trap errors in gtminstall from the configure script. Had this
+  error trapping existed previously, the first build logs would have shown this
+  bug.
+Applied-Upstream: V6.2-002
+Last-Update: 2015-04-22
 
 --- a/sr_unix/configure.gtc
 +++ b/sr_unix/configure.gtc
-@@ -656,6 +656,7 @@
- 	fi
- 	cd ..
- fi
-+ls -l $gtmdist/utf8
- 
- $echo ""
- $echo "All of the GT.M MUMPS routines are distributed with uppercase names."
-@@ -698,6 +699,7 @@
- if [ "$doutf8" -ne 0 ]; then
+@@ -699,12 +699,13 @@
  	# Enclose UTF-8 operations inside a subshell. This avoids changing the current M mode execution
  	(
-+		set -xv
  		# Ensure we ARE in UTF-8 mode
- 		utflocale=`locale -a | grep -i en_us | grep -i utf | grep '8$' | head -n 1`
+-		utflocale=`locale -a | grep -i en_us | grep -i utf | grep '8$' | head -n 1`
++		utflocale=`locale -a | grep -iE '\.utf.?8$' | head -n1`
  		if [ $arch = "zos" ]; then
+-			utflocale=`locale -a | grep -i en_us | grep -i utf | sed 's/.lp64$//' | grep '8$' | head -n 1`
++			utflocale=`locale -a | grep -i utf | sed 's/.lp64$//' | grep '8$' | head -n 1`
+ 		fi
+ 
+-		if [ $utflocale = "" ]; then
++		# If no locale is found use C
++		if [ "$utflocale" = "" ]; then
+ 			utflocale="C"
+ 		fi
+ 		if [ $arch != "zos" ]; then
+@@ -927,3 +928,4 @@
+ 		\rm -rf utf8
+ 	fi
+ fi
++exit 0
 --- a/sr_unix/gtminstall.sh
 +++ b/sr_unix/gtminstall.sh
-@@ -457,7 +457,7 @@
- # Stop here if this is a dry run
+@@ -458,6 +458,7 @@
  if [ "Y" = "$gtm_dryrun" ] ; then echo Installation prepared in $gtm_tmp ; exit ; fi
  
--./configure.sh <$gtm_configure_in 1> $gtm_tmp/configure_${timestamp}.out 2>$gtm_tmp/configure_${timestamp}.err
-+./configure.sh <$gtm_configure_in
+ ./configure.sh <$gtm_configure_in 1> $gtm_tmp/configure_${timestamp}.out 2>$gtm_tmp/configure_${timestamp}.err
++if [ $? -gt 0 ] ; then cat $gtm_tmp/configure_${timestamp}.out $gtm_tmp/configure_${timestamp}.err ; fi
  if [ "Y" = "$gtm_verbose" ] ; then echo Installation complete ; ls -l $gtm_installdir ; fi
  
  # Create copies of environment scripts and gtm executable

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/fis-gtm.git