From: Nicholas Clark <nick@ccl4.org>
Date: Sat, 31 Mar 2007 23:13:15 +0000 (+0000)
Subject: Integrate:
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=b1225a1b471182e0a875e14b76da023a738eea62;p=p5sagit%2Fp5-mst-13.2.git

Integrate:
[ 30652]
In safecalloc, use the system calloc() for the non-DEBUGGING case, as
it may be able to memset() to 0 for free.

[ 30661]
Remove the (sometimes) unused variable from change 30652.

[ 30670]
Subject: [PATCH] Change 30661 could result in undefined variable
From: "Jerry D. Hedden" <jdhedden@yahoo.com>
Message-ID: <915076.64236.qm@web30212.mail.mud.yahoo.com>
Date: Wed, 21 Mar 2007 12:47:52 -0700 (PDT)

[ 30771]
Subject: [PATCH] util.c [PATCH] perlhack.pod (Was: Re: threads crashes in Tru64)
From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Mon, 26 Mar 2007 19:50:11 -0400
Message-ID: <46085C33.1030601@iki.fi>
p4raw-link: @30771 on //depot/perl: ad7244db27635ed088fc05a8a69e99bbb19c36d6
p4raw-link: @30670 on //depot/perl: 6460123ae692a9c25bc8c2253f12c8cf6f0ebdc0
p4raw-link: @30661 on //depot/perl: a93c8a9e4a51d34ca994257e736b80ca04ec6f9e
p4raw-link: @30652 on //depot/perl: e1a95402a0ef053bf8dd15ba3824743513f0725e

p4raw-id: //depot/perl@30816
---

diff --git a/hints/freebsd.sh b/hints/freebsd.sh
index 8bfb742..7461207 100644
--- a/hints/freebsd.sh
+++ b/hints/freebsd.sh
@@ -138,11 +138,22 @@ case "$osvers" in
 *)
 	ccflags="${ccflags} -DHAS_FPSETMASK -DHAS_FLOATINGPOINT_H"
 	if /usr/bin/file -L /usr/lib/libc.so | /usr/bin/grep -vq "not stripped" ; then
-	    usenm=false
+	    # Respect a command-line override
+	    test -z "$usenm" && usenm=false
 	fi
         ;;
 esac
 
+
+# If we are using g++ we must use nm and force ourselves to use
+# the /usr/lib/libc.a because the symbol scanning tricks of 
+# Configure will crash and burn horribly.
+case "$cc" in
+*g++*) usenm=true
+       libc='/usr/lib/libc.a'
+       ;;
+esac
+
 cat <<'EOM' >&4
 
 Some users have reported that Configure halts when testing for