Change 19897 by [EMAIL PROTECTED] on 2003/07/01 05:04:50
Subject: Re: Subject: Problems: 5.8.1, Solaris, Configure, sched_yield(), -lrt
& -lposix4
From: Alan Burlison <[EMAIL PROTECTED]>
Date: Tue, 01 Jul 2003 00:03:24 +0100
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/perl/Configure#539 edit
... //depot/perl/Makefile.SH#276 edit
... //depot/perl/config_h.SH#279 edit
... //depot/perl/configure.com#180 edit
... //depot/perl/hints/solaris_2.sh#85 edit
... //depot/perl/perl.h#521 edit
... //depot/perl/uconfig.h#71 edit
... //depot/perl/uconfig.sh#58 edit
Differences ...
==== //depot/perl/Configure#539 (xtext) ====
Index: perl/Configure
--- perl/Configure#538~19760~ Fri Jun 13 05:00:06 2003
+++ perl/Configure Mon Jun 30 22:04:50 2003
@@ -565,7 +565,6 @@
d_msgsnd=''
d_msync=''
d_munmap=''
-d_nanosleep=''
d_nice=''
d_nl_langinfo=''
d_off64_t=''
@@ -1268,10 +1267,8 @@
usereentrant='undef'
: List of libraries we want.
: If anyone needs -lnet, put it in a hint file.
-libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl'
-libswanted="$libswanted dld ld sun m c cposix posix"
-libswanted="$libswanted ndir dir crypt sec"
-libswanted="$libswanted ucb bsd BSD PW x util rt posix4"
+libswanted="sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun"
+libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD"
: We probably want to search /usr/shlib before most other libraries.
: This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
@@ -14239,10 +14236,6 @@
set munmap d_munmap
eval $inlibc
-: see if nanosleep exists
-set nanosleep d_nanosleep
-eval $inlibc
-
: see if nice exists
set nice d_nice
eval $inlibc
@@ -20718,7 +20711,6 @@
d_msync='$d_msync'
d_munmap='$d_munmap'
d_mymalloc='$d_mymalloc'
-d_nanosleep='$d_nanosleep'
d_nice='$d_nice'
d_nl_langinfo='$d_nl_langinfo'
d_nv_preserves_uv='$d_nv_preserves_uv'
==== //depot/perl/Makefile.SH#276 (text) ====
Index: perl/Makefile.SH
--- perl/Makefile.SH#275~19549~ Sat May 17 22:58:58 2003
+++ perl/Makefile.SH Mon Jun 30 22:04:50 2003
@@ -494,7 +494,7 @@
case "$useshrplib" in
true)
$spitshell >>Makefile <<'!NO!SUBS!'
- $(LD) -o $@ $(SHRPLDFLAGS) perl$(OBJ_EXT) $(obj)
+ $(LD) -o $@ $(SHRPLDFLAGS) perl$(OBJ_EXT) $(obj) $(libs)
!NO!SUBS!
case "$osname" in
aix)
==== //depot/perl/config_h.SH#279 (text) ====
Index: perl/config_h.SH
--- perl/config_h.SH#278~19608~ Fri May 23 23:30:40 2003
+++ perl/config_h.SH Mon Jun 30 22:04:50 2003
@@ -2662,12 +2662,6 @@
*/
#$d_msghdr_s HAS_STRUCT_MSGHDR /**/
-/* HAS_NANOSLEEP:
- * This symbol, if defined, indicates that the nanosleep
- * system call is available to sleep with 1E-9 sec accuracy.
- */
-#$d_nanosleep HAS_NANOSLEEP /**/
-
/* HAS_NL_LANGINFO:
* This symbol, if defined, indicates that the nl_langinfo routine is
* available to return local data. You will also need <langinfo.h>
==== //depot/perl/configure.com#180 (text) ====
Index: perl/configure.com
--- perl/configure.com#179~19719~ Mon Jun 9 08:28:18 2003
+++ perl/configure.com Mon Jun 30 22:04:50 2003
@@ -5529,7 +5529,6 @@
$ WC "d_unordered='undef'"
$ WC "d_usleep='" + d_usleep + "'"
$ WC "d_usleepproto='" + d_usleep + "'"
-$ WC "d_nanosleep='undef'"
$ WC "d_ustat='undef'"
$ WC "d_vendorarch='undef'"
$ WC "d_vendorlib='undef'"
==== //depot/perl/hints/solaris_2.sh#85 (text) ====
Index: perl/hints/solaris_2.sh
--- perl/hints/solaris_2.sh#84~19709~ Sun Jun 8 09:45:50 2003
+++ perl/hints/solaris_2.sh Mon Jun 30 22:04:50 2003
@@ -330,6 +330,21 @@
END
fi
fi
+
+# Check to see if the selected compiler and linker
+# support the -z ignore, -z lazyload and -z combreloc flags.
+echo "int main() { return(0); } " > try.c
+ zflgs=''
+for zf in ignore lazyload combreloc; do
+ if ${cc:-cc} -o try try.c -z $zf > /dev/null 2>&1; then
+ zflgs="$zflgs -z $zf"
+ fi
+done
+if test -n "$zflgs"; then
+ ccdlflags="$ccdlflags $zflgs"
+ lddlflags="$lddlflags -G $zflgs"
+fi
+
# as --version or ld --version might dump core.
rm -f try try.c core
EOCBU
@@ -341,12 +356,8 @@
$define|true|[yY]*)
ccflags="-D_REENTRANT $ccflags"
- # sched_yield is in -lposix4 up to Solaris 2.6, in -lrt starting with Solaris
2.7
- case `uname -r` in
- 5.[0-6] | 5.5.1) sched_yield_lib="posix4" ;;
- *) sched_yield_lib="rt";
- esac
- set `echo X "$libswanted "| sed -e "s/ c / $sched_yield_lib pthread c /"`
+ sched_yield='yield'
+ set `echo X "$libswanted "| sed -e "s/ c / pthread c /"`
shift
libswanted="$*"
@@ -496,7 +507,7 @@
EOM
exit 1
fi
- case "$cc -v 2>/dev/null" in
+ case "${cc:-cc} -v 2>/dev/null" in
*gcc*)
echo 'int main() { return 0; }' > try.c
case "`${cc:-cc} -mcpu=v9 -m64 -S try.c 2>&1 | grep 'm64 is not
supported by this configuration'`" in
@@ -561,7 +572,7 @@
#include <sunmath.h>
int main() { (void) powl(2, 256); return(0); }
EOM
- if cc try.c -lsunmath -o try > /dev/null 2>&1 && ./try; then
+ if ${cc:-cc} try.c -lsunmath -o try > /dev/null 2>&1 && ./try; then
libswanted="$libswanted sunmath"
fi
else
==== //depot/perl/perl.h#521 (text) ====
Index: perl/perl.h
--- perl/perl.h#520~19880~ Sun Jun 29 02:48:50 2003
+++ perl/perl.h Mon Jun 30 22:04:50 2003
@@ -4371,7 +4371,6 @@
HAS_UALARM
HAS_USLEEP
- HAS_NANOSLEEP
HAS_SETITIMER
HAS_GETITIMER
==== //depot/perl/uconfig.h#71 (text) ====
Index: perl/uconfig.h
--- perl/uconfig.h#70~19608~ Fri May 23 23:30:40 2003
+++ perl/uconfig.h Mon Jun 30 22:04:50 2003
@@ -2638,12 +2638,6 @@
*/
/*#define HAS_STRUCT_MSGHDR / **/
-/* HAS_NANOSLEEP:
- * This symbol, if defined, indicates that the nanosleep
- * system call is available to sleep with 1E-9 sec accuracy.
- */
-/*#define HAS_NANOSLEEP / **/
-
/* HAS_NL_LANGINFO:
* This symbol, if defined, indicates that the nl_langinfo routine is
* available to return local data. You will also need <langinfo.h>
==== //depot/perl/uconfig.sh#58 (xtext) ====
Index: perl/uconfig.sh
--- perl/uconfig.sh#57~19607~ Fri May 23 23:23:51 2003
+++ perl/uconfig.sh Mon Jun 30 22:04:50 2003
@@ -239,7 +239,6 @@
d_msync='undef'
d_munmap='undef'
d_mymalloc='undef'
-d_nanosleep='undef'
d_nice='undef'
d_nl_langinfo='undef'
d_nv_preserves_uv='undef'
End of Patch.
