Change 33195 by [EMAIL PROTECTED] on 2008/02/02 17:17:29
Integrate:
[ 32607]
Subject: [PATCH] Escape $ENV in comments in config_h.SH
From: "Jerry D. Hedden" <[EMAIL PROTECTED]>
Date: Tue, 11 Dec 2007 09:12:32 -0500
Message-ID: <[EMAIL PROTECTED]>
[ 32623]
Subject: [PATCH cflags.SH] typo?
From: "Robin Barker" <[EMAIL PROTECTED]>
Date: Mon, 17 Dec 2007 10:27:28 -0000
Message-ID: <[EMAIL PROTECTED]>
[ 32632]
Make the hint file work as well on 64-bit linuxes,
noticed by Wolfgang Friebel
Affected files ...
... //depot/maint-5.8/perl/cflags.SH#12 integrate
... //depot/maint-5.8/perl/config_h.SH#50 integrate
... //depot/maint-5.8/perl/ext/ODBM_File/hints/linux.pl#4 integrate
Differences ...
==== //depot/maint-5.8/perl/cflags.SH#12 (xtext) ====
Index: perl/cflags.SH
--- perl/cflags.SH#11~32457~ 2007-11-22 15:19:55.000000000 -0800
+++ perl/cflags.SH 2008-02-02 09:17:29.000000000 -0800
@@ -183,7 +183,7 @@
"long long")
ccflags=`echo $ccflags|sed -e 's/-pedantic/ /' -e 's/-std=c89/ /' -e
's/-ansi/ /'`
warn=`echo $warn|sed -e 's/-pedantic/ /' -e 's/-ansi/ /'`
- stdflags=`echo $warn|sed -e 's/-std=c89/ /'`
+ stdflags=`echo $stdflags|sed -e 's/-std=c89/ /'`
;;
esac
fi
==== //depot/maint-5.8/perl/config_h.SH#50 (text) ====
Index: perl/config_h.SH
--- perl/config_h.SH#49~31146~ 2007-05-04 15:15:30.000000000 -0700
+++ perl/config_h.SH 2008-02-02 09:17:29.000000000 -0800
@@ -1760,7 +1760,7 @@
/* LOCALTIME_R_NEEDS_TZSET:
* Many libc's localtime_r implementations do not call tzset,
* making them differ from localtime(), and making timezone
- * changes using $ENV{TZ} without explicitly calling tzset
+ * changes using \$ENV{TZ} without explicitly calling tzset
* impossible. This symbol makes us call tzset before localtime_r
*/
#$d_localtime_r_needs_tzset LOCALTIME_R_NEEDS_TZSET /**/
==== //depot/maint-5.8/perl/ext/ODBM_File/hints/linux.pl#4 (text) ====
Index: perl/ext/ODBM_File/hints/linux.pl
--- perl/ext/ODBM_File/hints/linux.pl#3~32374~ 2007-11-17 09:32:02.000000000
-0800
+++ perl/ext/ODBM_File/hints/linux.pl 2008-02-02 09:17:29.000000000 -0800
@@ -3,6 +3,6 @@
# Debian/Ubuntu have /usr/lib/libgdbm_compat.so.3* but not this file,
# so linking may fail
-if (-e '/usr/lib/libgdbm_compat.so') {
+if (-e '/usr/lib/libgdbm_compat.so' or -e '/usr/lib64/libgdbm_compat.so') {
$self->{LIBS}->[0] .= ' -lgdbm_compat';
}
End of Patch.
