components/perl/perl516/patches/hints_solaris_2.sh.patch
author Craig Mohrman <craig.mohrman@oracle.com>
Fri, 22 Mar 2013 12:37:36 -0700
branchs11-update
changeset 2528 788328aeec2a
permissions -rw-r--r--
PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default 15818668 SUNBT7201230 update perl to 5.16 16096782 Userland Perl should use mediated links 15941379 perl512 "gmake test" failures 15820486 problem in UTILITY/PERL 15880426 problem in UTILITY/PERL 16417744 problem in UTILITY/PERL 16383261 problem in UTILITY/PERL 16427786 problem in UTILITY/PERL 16486887 perl 5.16 needs to build x86 64-bit properly
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2528
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     1
--- perl-5.16.2/hints/solaris_2.sh_orig	2012-10-25 19:44:15.000000000 -0700
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     2
+++ perl-5.16.2/hints/solaris_2.sh	2013-03-15 10:29:25.175779461 -0700
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     3
@@ -84,8 +84,8 @@
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     4
 	getworkshoplibs=`cat <<'END'
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     5
 eval $tryworkshopcc -### 2>&1 | \
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     6
 sed -n '/ -Y /s!.* -Y "P,\([^"]*\)".*!\1!p' | tr ':' ' ' | \
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     7
-sed -e 's!/usr/lib/sparcv9!!' -e 's!/usr/ccs/lib/sparcv9!!' \
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     8
-    -e 's!/usr/lib!!g' -e 's!/usr/ccs/lib!!g'
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     9
+sed -e 's!/lib/64!!' -e 's!/usr/lib/64!!' \
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    10
+    -e 's!/lib!!g' -e 's!/usr/lib!!g'
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    11
 END
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    12
 `
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    13
 
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    14
@@ -552,8 +552,7 @@
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    15
 		;;
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    16
 	    esac
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    17
 	    processor=`uname -p`;
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    18
-	    if test "$processor" = sparc; then
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    19
-		libc='/usr/lib/sparcv9/libc.so'
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    20
+		libc='/lib/64/libc.so'
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    21
 		if test ! -f $libc; then
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    22
 		    cat >&4 <<EOM
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    23
 
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    24
@@ -563,7 +562,6 @@
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    25
 EOM
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    26
 		    exit 1
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    27
 		fi
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    28
-	    fi
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    29
 	    case "${cc:-cc} -v 2>/dev/null" in
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    30
 	    *gcc*)
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    31
 		echo 'int main() { return 0; }' > try.c
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    32
@@ -614,9 +612,7 @@
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    33
 
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    34
 		echo "int main() { return(0); } " > try.c
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    35
 		tryworkshopcc="${cc:-cc} try.c -o try $ccflags"
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    36
-		if test "$processor" = sparc; then
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    37
-		    loclibpth="/usr/lib/sparcv9 /usr/ccs/lib/sparcv9 $loclibpth"
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    38
-		fi
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    39
+		loclibpth="/lib/64 /usr/lib/64 $loclibpth"
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    40
 		loclibpth="`$getworkshoplibs` $loclibpth"
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    41
 		;;
788328aeec2a PSARC/2012/379 Add Perl 5.16 64-bit and make it the system default
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    42
 	    esac